OSDN Git Service
Phil Burk [Thu, 6 Aug 2015 06:32:54 +0000 (23:32 -0700)]
MidiService: update listener with current status when registered
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.
Bug:
22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
Filip Gruszczynski [Fri, 4 Sep 2015 16:18:42 +0000 (16:18 +0000)]
Merge "Defer removal of relaunching activity window due to config change."
Filip Gruszczynski [Thu, 3 Sep 2015 23:03:10 +0000 (16:03 -0700)]
Defer removal of relaunching activity window due to config change.
This is the first step towards having a better maximization experience.
When the window gets replaced during relaunch of maximized activity we
keep the old window around until the new one is added.
Change-Id: Ia8ce26aee6577740cd38096ed2633216a07ceb60
Filip Gruszczynski [Fri, 4 Sep 2015 14:50:00 +0000 (14:50 +0000)]
Merge "Remove unused WMS.mBatteryStats."
Alan Viverette [Fri, 4 Sep 2015 14:37:11 +0000 (10:37 -0400)]
Remove flaky ListManagedCursorTest tests, clean up lint warnings
Also removes trailing ws.
Bug:
23811652
Change-Id: I2ae5c954606e95bcb4cfe52297717d4caf444cd0
Abodunrinwa Toki [Fri, 4 Sep 2015 14:37:09 +0000 (14:37 +0000)]
Merge "Suppress tests in ListManagedCursorTest."
Abodunrinwa Toki [Fri, 4 Sep 2015 14:33:57 +0000 (15:33 +0100)]
Suppress tests in ListManagedCursorTest.
These tests are flaky.
Bug:
23811652
Change-Id: Ic2aac3e852fbdaf3cfae54997212b976e830d121
Alan Viverette [Fri, 4 Sep 2015 14:29:45 +0000 (14:29 +0000)]
am
c0b0da36: am
bc635a25: am
3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"
* commit '
c0b0da36ea6870601fc1be8d14f8f52ec56095cb':
Update mFillPaint color on GradientDrawable inflation
Yasuhiro Matsuda [Fri, 4 Sep 2015 14:28:49 +0000 (14:28 +0000)]
am
e651ee9b: am
10191dd9: am
53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '
e651ee9bef73c00c3ca1f1ed57485a6c06b802fd':
Remove unnecessary finally blocks for tracing.
Andre Eisenbach [Fri, 4 Sep 2015 14:28:39 +0000 (14:28 +0000)]
am
b013468b: am
f1ed1fdb: am
1b03cd8e: am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
b013468beca1ec7397c22111b187ffecb20f070a':
Bluetooth: Fix profile auto-connect logic
Dan Stoza [Fri, 4 Sep 2015 14:28:31 +0000 (14:28 +0000)]
am
8dcd14cd: am
4a90942e: am
f615872c: am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
8dcd14cdc95a5b71597fa428b9c2a45c3a86944c':
SurfaceControl: Add colorTransform to DisplayInfo
Amit Mahajan [Fri, 4 Sep 2015 14:28:24 +0000 (14:28 +0000)]
am
453ed7dd: am
ff751bed: am
2f142ab0: am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
453ed7ddae6fda8ebb5931011f821ce1982a6a4b':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Sharvil Nanavati [Fri, 4 Sep 2015 14:28:12 +0000 (14:28 +0000)]
am
db8a6ee5: (-s ours) am
80770c09: am
16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
* commit '
db8a6ee56b8e40d0a743e929739fb19a8b3ec456':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
Alan Viverette [Fri, 4 Sep 2015 14:21:26 +0000 (14:21 +0000)]
Merge "Use floating-point value for Drawable level"
Abodunrinwa Toki [Fri, 4 Sep 2015 13:31:51 +0000 (13:31 +0000)]
Merge "Suppress tests in ListManagedCursorTest."
Abodunrinwa Toki [Fri, 4 Sep 2015 13:16:40 +0000 (14:16 +0100)]
Suppress tests in ListManagedCursorTest.
These tests are flaky.
Bug:
23811652
Change-Id: I6b61cebab9517393b6dc0a315e1589739ea50fb8
Alan Viverette [Fri, 4 Sep 2015 12:40:02 +0000 (12:40 +0000)]
am
bc635a25: am
3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"
* commit '
bc635a2574430f345aaa042e003935f315788304':
Update mFillPaint color on GradientDrawable inflation
Alan Viverette [Fri, 4 Sep 2015 12:31:46 +0000 (12:31 +0000)]
am
3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"
* commit '
3d6325460ec19c89c40d2083e8ca89fe53d5575b':
Update mFillPaint color on GradientDrawable inflation
Alan Viverette [Fri, 4 Sep 2015 11:51:02 +0000 (11:51 +0000)]
Merge "Update mFillPaint color on GradientDrawable inflation"
Abodunrinwa Toki [Fri, 4 Sep 2015 10:52:13 +0000 (10:52 +0000)]
Merge "Suppress AutoCancelTest."
Abodunrinwa Toki [Fri, 4 Sep 2015 10:42:16 +0000 (11:42 +0100)]
Suppress AutoCancelTest.
These tests are failing consistently.
Bug:
23807249
Change-Id: I1275747462b20e37ff0f631dbd9e7acfadece5a2
Snild Dolkow [Fri, 4 Sep 2015 08:08:05 +0000 (10:08 +0200)]
Update mFillPaint color on GradientDrawable inflation
When a GradientDrawable is loaded from scratch, initializeWithState()
is called with mColors == null. This sets mFillPaint's color to
0x00000000 -- transparent. mColors is then properly set in inflate(),
but mFillPaint is not updated there. It will be updated eventually
through a mutate() or ensureValidRect() call, but that's sometimes too
late.
In our case, a wrapping StateListDrawable called getOpacity(), and
since it caches the result, it never got updated.
This doesn't cause any problems on preloaded GradientDrawables, since
the new GradientDrawable created when fetching a preload will call
initializeWithState() in its constructor, fixing the GradientState.
Change-Id: Ic8caa7c6a7c1d4dae5ff31ae943831bd2e014f79
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:47:52 +0000 (02:47 +0000)]
am
10191dd9: am
53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '
10191dd9d20f589fd6f7868a350c104372a57687':
Remove unnecessary finally blocks for tracing.
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:34:58 +0000 (02:34 +0000)]
am
53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '
53f1a815b4401f10cd833217143da44ab0408dcc':
Remove unnecessary finally blocks for tracing.
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:23:31 +0000 (02:23 +0000)]
Merge "Remove unnecessary finally blocks for tracing."
Andre Eisenbach [Fri, 4 Sep 2015 02:22:11 +0000 (02:22 +0000)]
am
f1ed1fdb: am
1b03cd8e: am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
f1ed1fdb4578c205ebe2d1af6f49512219506254':
Bluetooth: Fix profile auto-connect logic
Dan Stoza [Fri, 4 Sep 2015 02:21:41 +0000 (02:21 +0000)]
am
4a90942e: am
f615872c: am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
4a90942ea75039f916d8371111fdc41a80039b98':
SurfaceControl: Add colorTransform to DisplayInfo
Amit Mahajan [Fri, 4 Sep 2015 02:21:31 +0000 (02:21 +0000)]
am
ff751bed: am
2f142ab0: am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
ff751bed7ce737d95db2edc79ffe2f34c0259a27':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Sharvil Nanavati [Fri, 4 Sep 2015 02:21:21 +0000 (02:21 +0000)]
am
80770c09: am
16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
* commit '
80770c099144b65e9c7768bbdb56608eebf03b01':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
Chong Zhang [Mon, 31 Aug 2015 22:17:21 +0000 (15:17 -0700)]
Allow apps to pass in launch bounds when moving/starting a task
Pass in bounds via ActivityOptions for moveTaskToFront and
startActivityFromRecents. Allow bounds to be overriden by rects
in starting intents.
Set bounds to null in RecentsView for full screen layout.
Change-Id: I0ff79fd75068f4ba82d5e2c0a21881fabebdadb8
Andre Eisenbach [Fri, 4 Sep 2015 00:28:09 +0000 (00:28 +0000)]
am
1b03cd8e: am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
1b03cd8e1b79280e892f81709ced42b990a8905d':
Bluetooth: Fix profile auto-connect logic
Andre Eisenbach [Fri, 4 Sep 2015 00:12:33 +0000 (00:12 +0000)]
am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
1d5e2e291d4c3fbcde1425af74644a24c94e1577':
Bluetooth: Fix profile auto-connect logic
Filip Gruszczynski [Fri, 4 Sep 2015 00:03:05 +0000 (17:03 -0700)]
Remove unused WMS.mBatteryStats.
Change-Id: I0ff684287ac27d77c6ca778b7b30666969c739aa
Andre Eisenbach [Fri, 4 Sep 2015 00:02:57 +0000 (00:02 +0000)]
Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
Filip Gruszczynski [Thu, 3 Sep 2015 23:02:41 +0000 (23:02 +0000)]
Merge "Fix fitWithinBounds to actually apply stack bounds."
Wale Ogunwale [Thu, 3 Sep 2015 22:55:41 +0000 (22:55 +0000)]
Merge "Ignore empty locale list when diffing Configuration objects"
Andre Eisenbach [Thu, 3 Sep 2015 22:20:09 +0000 (15:20 -0700)]
Bluetooth: Fix profile auto-connect logic
The fix in commit
05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.
This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.
Bug:
22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
Dan Stoza [Thu, 3 Sep 2015 22:13:31 +0000 (22:13 +0000)]
am
f615872c: am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
f615872cb49062de9113c7c5be31d3b1d1b423af':
SurfaceControl: Add colorTransform to DisplayInfo
Filip Gruszczynski [Thu, 3 Sep 2015 00:21:21 +0000 (17:21 -0700)]
Fix fitWithinBounds to actually apply stack bounds.
Bug:
23749629
Change-Id: Idfca4a83647c3a70c954caeca70d73aa9deee38b
Wale Ogunwale [Thu, 3 Sep 2015 22:08:51 +0000 (15:08 -0700)]
Ignore empty locale list when diffing Configuration objects
b46fdd4 introduced the concept of locale list to Configuration objects.
However, the change alway returned a locale difference when the delta
object locale list is set to the defualt (empty). We now don't return
a difference if the delta object as an empty locale list which is
consistent with what we did before the change and in line with how we
diff other configuration fields.
Bug:
23744091
Change-Id: I8c2c39d9a7e91e6a3a283312b745c4fdf6874396
Adrian Roos [Thu, 3 Sep 2015 22:06:08 +0000 (22:06 +0000)]
am
5b92de04: am
6bd2f87e: am
bd2ad550: am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
5b92de04b7ff9954a50e54a86f11443a904fa547':
Don't disable fingerprint when entering wrong credential
Dan Stoza [Thu, 3 Sep 2015 22:03:08 +0000 (22:03 +0000)]
am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
0b887e579b766012c09626e7089a3fade5415ee6':
SurfaceControl: Add colorTransform to DisplayInfo
Adrian Roos [Thu, 3 Sep 2015 22:02:49 +0000 (15:02 -0700)]
resolved conflicts for merge of
123fb19d to master
Change-Id: Ie029b8d72eaf968a5224cd0b90d97b112d51ba35
Dan Stoza [Thu, 3 Sep 2015 21:55:36 +0000 (21:55 +0000)]
Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
Amit Mahajan [Thu, 3 Sep 2015 21:50:00 +0000 (21:50 +0000)]
am
2f142ab0: am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
2f142ab0779c9e36c6f733d7e2e0be083f7172ac':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Amit Mahajan [Thu, 3 Sep 2015 21:39:52 +0000 (21:39 +0000)]
am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
8a670f1da434c4720b08dbb62c635316e593b9b3':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Alan Viverette [Thu, 3 Sep 2015 21:39:26 +0000 (21:39 +0000)]
Merge "Minor clean up in ActivityThread, mostly final usage"
Alan Viverette [Thu, 3 Sep 2015 21:39:07 +0000 (21:39 +0000)]
Merge "Postpone loading app context until instrumentation is set up"
Amit Mahajan [Thu, 3 Sep 2015 21:24:46 +0000 (21:24 +0000)]
Merge changes from topic 'TDSCDMA support' into mnc-dr-dev
* changes:
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Sharvil Nanavati [Thu, 3 Sep 2015 21:12:33 +0000 (21:12 +0000)]
am
16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
* commit '
16db4101829c7beee42a09fcaf87fa4e31bc1d5a':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
Sharvil Nanavati [Thu, 3 Sep 2015 21:02:43 +0000 (21:02 +0000)]
Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev
Dan Stoza [Mon, 31 Aug 2015 19:01:48 +0000 (12:01 -0700)]
SurfaceControl: Add colorTransform to DisplayInfo
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.
Bug:
20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
Adrian Roos [Thu, 3 Sep 2015 20:07:30 +0000 (20:07 +0000)]
am
6bd2f87e: am
bd2ad550: am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
6bd2f87ee4eac554646c5b04c44b6e3402bac84e':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 20:07:25 +0000 (20:07 +0000)]
am
95179ad4: am
54ceea19: am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
95179ad4be0377dd9fd35818145f705bcded0d28':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:58:08 +0000 (19:58 +0000)]
am
bd2ad550: am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
bd2ad550c5a7c7b7efbe3510f212322fb173b06c':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 19:57:58 +0000 (19:57 +0000)]
am
54ceea19: am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:46:45 +0000 (19:46 +0000)]
am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
34411e8fecab310a0402bd77e8fe5a5a488a783a':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 19:46:41 +0000 (19:46 +0000)]
am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
95200e6f4eb34818ac0b652167cffacfcfb4fdff':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:42:39 +0000 (19:42 +0000)]
Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev
Adrian Roos [Thu, 3 Sep 2015 19:41:22 +0000 (19:41 +0000)]
Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
Adrian Roos [Thu, 3 Sep 2015 19:40:18 +0000 (19:40 +0000)]
am
40087027: am
4eb81345: am
b90f1de2: am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
4008702700b9e14c756d453deb3bdfaff9138e92':
Show face unlock even when fingerprint is running
Adrian Roos [Wed, 2 Sep 2015 20:23:30 +0000 (13:23 -0700)]
Don't disable fingerprint when entering wrong credential
Bug:
23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
Adrian Roos [Wed, 2 Sep 2015 20:26:25 +0000 (13:26 -0700)]
Poke fingerprint timeout when vold password is correct
Bug:
23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
Adrian Roos [Thu, 3 Sep 2015 19:29:42 +0000 (19:29 +0000)]
am
4eb81345: am
b90f1de2: am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
4eb81345da21efc2b9731cb1969704081064690c':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 19:17:36 +0000 (19:17 +0000)]
am
b90f1de2: am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
b90f1de216ec8be27eebd17b5f3c6a87ee084e75':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 19:08:53 +0000 (19:08 +0000)]
am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
1b5cc3a4ba46029b798adb9e362d87df5673bc52':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 18:59:37 +0000 (18:59 +0000)]
Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
Alan Viverette [Thu, 3 Sep 2015 18:56:04 +0000 (14:56 -0400)]
Minor clean up in ActivityThread, mostly final usage
Change-Id: Ic98103cb8b2ac6fb9b37fc9457366ded2bfbb7a8
Alan Viverette [Thu, 3 Sep 2015 18:55:27 +0000 (14:55 -0400)]
Postpone loading app context until instrumentation is set up
The application context needs instrumentation data to be in place
prior to construction so that the class loader is initialized using
the correct paths.
Removes unnecessary clearClassLoader() workaround that was previously
added to fix instrumentation tests.
Bug:
22627299
Change-Id: Ibf8e69e037189a9a563f0b68cfe333461726b71d
Ian Pedowitz [Thu, 3 Sep 2015 18:52:14 +0000 (18:52 +0000)]
am
7b0f661d: am
1635e818: am
cb92577a: am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
7b0f661d405a1c53067ec104a6c6ddd7abbae1e6':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:52:07 +0000 (18:52 +0000)]
am
e4428808: am
8fddbc44: am
a5cd5d87: am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
e4428808bf4d26cbfdef1a6f19f2c9a794442a9b':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:52:00 +0000 (18:52 +0000)]
am
c2f9e432: am
68025995: am
1942f8a7: am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
c2f9e4323cda3090cfa9197eb402f9279a72b224':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Ian Pedowitz [Thu, 3 Sep 2015 18:42:49 +0000 (18:42 +0000)]
am
1635e818: am
cb92577a: am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
1635e8182ad51c1085e608dea6d9ef470747f759':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:42:44 +0000 (18:42 +0000)]
am
8fddbc44: am
a5cd5d87: am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
8fddbc44b0f97b88839fb438d2b96b348547da96':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:42:38 +0000 (18:42 +0000)]
am
68025995: am
1942f8a7: am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
68025995632d2f4dc8e3fd9e7d518868c72d9e82':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Doris Liu [Thu, 3 Sep 2015 18:36:17 +0000 (18:36 +0000)]
Merge "Check whether AnimationDrawable is one shot only when visibility changes"
Ian Pedowitz [Thu, 3 Sep 2015 18:31:12 +0000 (18:31 +0000)]
am
cb92577a: am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
cb92577aa6201abbba2d2f17c8cc8d99d9754e8b':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:31:06 +0000 (18:31 +0000)]
am
a5cd5d87: am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
a5cd5d8756bbaa62f965489f6fe9cd52e3fd17eb':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:31:00 +0000 (18:31 +0000)]
am
1942f8a7: am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
1942f8a72dbbd6e436c4744bdfa8c79a7d6aae4d':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Ian Pedowitz [Thu, 3 Sep 2015 18:14:49 +0000 (18:14 +0000)]
am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
7d223aeef8c9108210e0d13e9458b4d701781ee0':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:14:17 +0000 (18:14 +0000)]
am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
0b5162c85f01f8451120e7ad82aa7193850862f7':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:14:13 +0000 (18:14 +0000)]
am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
d4ef34ce8d9cfb351e1a063ce2ff354ee0b9c13b':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Michael Wright [Thu, 3 Sep 2015 17:37:10 +0000 (17:37 +0000)]
am
7f7ffa37: am
87e4c951: am
59c1a0e1: am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
7f7ffa3722ef90a7bf5611221c4a4c9d06823a38':
Add TabletModeChangedListener for SystemUI.
Ian Pedowitz [Thu, 3 Sep 2015 17:34:50 +0000 (17:34 +0000)]
am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
0a76afb93e6f303921ab84e2f26747c3ebf19b62':
Don't crash on (invalid) hardware address lengths > 127.
Jim Miller [Thu, 3 Sep 2015 17:28:34 +0000 (17:28 +0000)]
am
9f29c392: am
ac1da481: am
f873f9ab: am
bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
* commit '
9f29c39271eb8c23637bf3ff92ae039f35c457d3':
Fingerprint should throttle after 5 attempts
Daniel Estrada Alva [Thu, 3 Sep 2015 17:25:51 +0000 (17:25 +0000)]
Merge "resolved conflicts for merge of
256718bc to master"
Xiaohui Chen [Thu, 3 Sep 2015 17:24:47 +0000 (17:24 +0000)]
Merge "Cleanup USER_OWNER in a11y manager and tests"
destradaa [Thu, 3 Sep 2015 17:24:05 +0000 (10:24 -0700)]
resolved conflicts for merge of
256718bc to master
Change-Id: Ia188e9ed57b4359627a59d25f412db73fb1cef4e
Xiaohui Chen [Thu, 3 Sep 2015 17:22:52 +0000 (17:22 +0000)]
Merge "Cleanup USER_OWNER in a11y service and tests"
Ian Pedowitz [Thu, 3 Sep 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev
Xiaohui Chen [Thu, 3 Sep 2015 17:21:22 +0000 (17:21 +0000)]
Merge "Cleanup USER_OWNER in SettingsProvider[Test]"
Svetoslav Ganov [Thu, 3 Sep 2015 17:17:46 +0000 (17:17 +0000)]
am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
6dd856b1ea31bae083b6c2ed40af812c41b3a6cf':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 17:17:42 +0000 (17:17 +0000)]
am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
512141d581133ad5c1712ac097dcee08d46bae2c':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Svetoslav Ganov [Thu, 3 Sep 2015 17:08:57 +0000 (17:08 +0000)]
Merge "Don't drop runtime permissions on older system app update." into mnc-dev
Wale Ogunwale [Thu, 3 Sep 2015 17:06:03 +0000 (17:06 +0000)]
Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
Steve McKay [Thu, 3 Sep 2015 16:54:59 +0000 (16:54 +0000)]
Merge "Consume event on singleTapUp."
Filip Gruszczynski [Wed, 2 Sep 2015 20:00:02 +0000 (13:00 -0700)]
Refactor layout and surface placement into a separate class.
OMG, WindowManagerService below 10kLOC. Barely.
Change-Id: I7062c10c767c01c08466b3903736ee35b341f2a5
Michael Wright [Thu, 3 Sep 2015 14:30:27 +0000 (14:30 +0000)]
am
87e4c951: am
59c1a0e1: am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
87e4c951bf876faefad9f4223f6a568777425ae7':
Add TabletModeChangedListener for SystemUI.
Michael Wright [Thu, 3 Sep 2015 14:20:44 +0000 (14:20 +0000)]
am
59c1a0e1: am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
59c1a0e1cb6cad46e30821e25f99c1ecce1227f0':
Add TabletModeChangedListener for SystemUI.
Michael Wright [Thu, 3 Sep 2015 14:10:05 +0000 (14:10 +0000)]
am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
8ae90587a510f72a176119b1f23add8bc36285b9':
Add TabletModeChangedListener for SystemUI.