drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,409 Commits 1 Branch 0 Tags
Commit Graph

147409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandeep Siddhartha
e0d514e56f am e84b47ef: am fea9117f: Merge "Stop recognition when shutting down VIS" into lmp-dev 
* commit 'e84b47efb2307fb1a837c342c7c5553aca4956f4':
  Stop recognition when shutting down VIS
 2014-08-02 01:59:24 +00:00
Sandeep Siddhartha
695ab56c74 am fea9117f: Merge "Stop recognition when shutting down VIS" into lmp-dev 
* commit 'fea9117ff22d0ad3f7e5d807987e95eadf4da1f4':
  Stop recognition when shutting down VIS
 2014-08-02 01:55:46 +00:00
Sandeep Siddhartha
f15532d9e5 am 01d13015: am 966134c7: Merge "Add a flag for multiple triggers with same recognition session" into lmp-dev 
* commit '01d130153a5f9901e653e3170473d31a703a4823':
  Add a flag for multiple triggers with same recognition session
 2014-08-02 01:34:45 +00:00
Sandeep Siddhartha
d8a4628695 am 966134c7: Merge "Add a flag for multiple triggers with same recognition session" into lmp-dev 
* commit '966134c701c1b8a6f3cf7195dc20414c1d4157e2':
  Add a flag for multiple triggers with same recognition session
 2014-08-02 01:31:27 +00:00
Robert Greenwalt
6d6abb028b am b4f29399: am dee1fdbe: Add Logging around getNetworkInfo. 
* commit 'b4f29399fe6d26695420a5031afc8e321490f418':
  Add Logging around getNetworkInfo.
 2014-08-02 00:24:20 +00:00
Robert Greenwalt
257a8113e2 am dee1fdbe: Add Logging around getNetworkInfo. 
* commit 'dee1fdbe20dabeec0d6d088c332ca3612a9b94f3':
  Add Logging around getNetworkInfo.
 2014-08-02 00:21:18 +00:00
Robert Greenwalt
83f0f755b0 Add Logging around getNetworkInfo. 
bug:16610051
Change-Id: I04f19efc99bce6d990364291b6cd8105f08ab263
 2014-08-02 00:15:41 +00:00
Lorenzo Colitti
2b78b3614b am 76e38053: am 2036a0f9: Improve LegacyTypeTracker. 
* commit '76e38053255ca193f75451ac6a857dd7334e306a':
  Improve LegacyTypeTracker.
 2014-08-01 23:58:46 +00:00
Lorenzo Colitti
3d37f0845c am 2036a0f9: Improve LegacyTypeTracker. 
* commit '2036a0f9f0d8df2f0d265218279edac082737ac7':
  Improve LegacyTypeTracker.
 2014-08-01 23:54:53 +00:00
Lorenzo Colitti
a793a67197 Improve LegacyTypeTracker. 
Keep track of requests as well as of networks that come and go.
This is necessary, for example, to ensure that we pretend that
HIPRI has gone down when the HIPRI request goes away, even
though the underlying cell network is actually completely
unaffected.

Also, ensure that when switching default networks we send
disconnect broadcasts (and do so *before* connect broadcasts, to
maintain the illusion).

Bug: 16610051
Change-Id: Ib3c831387124940156df05b312cc36bc0724373e
 2014-08-01 23:52:04 +00:00
Dake Gu
3e0f746842 am f7560b36: am de545505: ActivityTransitionCoordinator: Fix memory leak of ResultReceiver 
* commit 'f7560b3605c05906eae558194a59986321ade08c':
  ActivityTransitionCoordinator: Fix memory leak of ResultReceiver
 2014-08-01 23:15:10 +00:00
Dake Gu
26ec988494 am de545505: ActivityTransitionCoordinator: Fix memory leak of ResultReceiver 
* commit 'de5455053f2aa08b1fa1ed45d21c4b00f62ddb43':
  ActivityTransitionCoordinator: Fix memory leak of ResultReceiver
 2014-08-01 23:11:32 +00:00
Dake Gu
fc0fc0e341 ActivityTransitionCoordinator: Fix memory leak of ResultReceiver 
The ActivityTransitionCoordinator is retained by reference from native code.
The coordinator refers to a app's listener which can cause leak.

b/16737906

Change-Id: Ibbb85480b852442f95b00a8d3beff0161bdadb47
 2014-08-01 22:53:14 +00:00
Roozbeh Pournader
dfd71a1396 am acbf52ae: am 66f933a2: Merge "Fix GSUB ccmp rule to use non-spacing marks." into lmp-dev 
* commit 'acbf52aeb64e90c538537d0c39bf886b52e09d68':
  Fix GSUB ccmp rule to use non-spacing marks.
 2014-08-01 22:26:54 +00:00
Roozbeh Pournader
3a1e02cad3 am 66f933a2: Merge "Fix GSUB ccmp rule to use non-spacing marks." into lmp-dev 
* commit '66f933a23c5490094bfb6149e26afe5797f151c3':
  Fix GSUB ccmp rule to use non-spacing marks.
 2014-08-01 22:22:44 +00:00
Behdad Esfahbod
37f8c25bad am 7838bf82: am 1de5e88f: Merge "Add fontFeatureSettings to TextView and attrs" into lmp-dev 
* commit '7838bf825285c99d94339eea7415a9b0f0fb3c49':
  Add fontFeatureSettings to TextView and attrs
 2014-08-01 21:50:28 +00:00
Wei Wang
7c9ddc0311 am f50b88a5: am aac04a4f: Merge "Add a default impelementation of IBluetoothGattCallback(1/2)." into lmp-dev 
* commit 'f50b88a50180d55e9256dc1280178f3cce8b6310':
  Add a default impelementation of IBluetoothGattCallback(1/2).
 2014-08-01 21:50:24 +00:00
Behdad Esfahbod
a85714f377 am 1de5e88f: Merge "Add fontFeatureSettings to TextView and attrs" into lmp-dev 
* commit '1de5e88fba15a5b6123c6e115d060789e2a88609':
  Add fontFeatureSettings to TextView and attrs
 2014-08-01 21:46:07 +00:00
Wei Wang
838c6cbae1 am aac04a4f: Merge "Add a default impelementation of IBluetoothGattCallback(1/2)." into lmp-dev 
* commit 'aac04a4faa8e50389eeabef6af568051ab43fc52':
  Add a default impelementation of IBluetoothGattCallback(1/2).
 2014-08-01 21:46:03 +00:00
Evan Charlton
694b1d2555 am 5b9d24a2: am 53488bf3: Make Connection threadsafe 
* commit '5b9d24a268a17578f29e9e630435b833f46608f2':
  Make Connection threadsafe
 2014-08-01 21:42:25 +00:00
Evan Charlton
29a177cac0 am 53488bf3: Make Connection threadsafe 
* commit '53488bf3d152eb0ecacca5716c763e8cd7ab28ae':
  Make Connection threadsafe
 2014-08-01 21:37:49 +00:00
Evan Charlton
b09c2b5dad Make Connection threadsafe 
Punt all modification calls to the UI thread to avoid concurrency
issues. This also makes all callback events (e.g., onAbort()) be
called on the same thread.

Bug: 16731451
Change-Id: I4dfd7493538724b3249780272411e61d956b146a
 2014-08-01 21:34:16 +00:00
Wink Saville
62ccb89a5c am b0e60f0e: am 106a9b72: Merge "Fix double DBG check." into lmp-dev 
* commit 'b0e60f0e2d5571d38225eba9169a4b8fd2c6794d':
  Fix double DBG check.
 2014-08-01 20:44:43 +00:00
Wink Saville
135e31530f am 106a9b72: Merge "Fix double DBG check." into lmp-dev 
* commit '106a9b72aea449d2484d7373d7c42d7c2fa2692f':
  Fix double DBG check.
 2014-08-01 20:40:09 +00:00
Wei Wang
c5295fa40e am b89e6747: am 8508d7ff: Merge "Revert "Revert "Service data and manufacturer data can be repeated fields.""" into lmp-dev 
* commit 'b89e6747f758e78e6fe916801c090bc3bfaa48e5':
  Revert "Revert "Service data and manufacturer data can be repeated fields.""
 2014-08-01 20:37:00 +00:00
Wei Wang
ad7cc9bb0e am 8508d7ff: Merge "Revert "Revert "Service data and manufacturer data can be repeated fields.""" into lmp-dev 
* commit '8508d7fff62aa66d64bfcf1dbe0238bf6a17c9c8':
  Revert "Revert "Service data and manufacturer data can be repeated fields.""
 2014-08-01 20:32:51 +00:00
Wink Saville
b84845c321 am 35788127: am 017654ee: Turn off extra debugging 
* commit '35788127dfcb3b9efb0d9142bf293f14851b444c':
  Turn off extra debugging
 2014-08-01 19:54:33 +00:00
Wink Saville
7a163fabc8 am 017654ee: Turn off extra debugging 
* commit '017654eed6cbf52e1eb8cb6c2ba2b9b3ea2c98df':
  Turn off extra debugging
 2014-08-01 19:50:57 +00:00
Wink Saville
6d13bc8e3b Turn off extra debugging 
Change-Id: I3d7c68d3d7bcef5be084398807389f4a485bedb0
 2014-08-01 12:36:54 -07:00
Jason Monk
9b5b9ecbff am 9c632f16: am 7eec31af: Don\'t show guest when user switcher is simple 
* commit '9c632f164ee0e03844177199e0ccc13e5b78974d':
  Don't show guest when user switcher is simple
 2014-08-01 18:46:03 +00:00
Jason Monk
abc52fa3bd am 7eec31af: Don\'t show guest when user switcher is simple 
* commit '7eec31af948b8534f56fbb103ca1c89be417ca60':
  Don't show guest when user switcher is simple
 2014-08-01 18:41:58 +00:00
Jason Monk
2daf62ce40 Don't show guest when user switcher is simple 
Bug: 15729059
Change-Id: I9e88f0e7d01044a7096d6fc8d67bcd328014a625
 2014-08-01 18:37:01 +00:00
Eric Laurent
ae8f14f265 am d5ec806a: am 991bd713: Merge "unhide AudioFormat getters" into lmp-dev 
* commit 'd5ec806a6dd0ba6b0f242ac9ebb5425de4a27bdf':
  unhide AudioFormat getters
 2014-08-01 18:06:04 +00:00
Jean-Michel Trivi
dbec29c721 am df81262b: am d6a832db: AudioAttributes: always build formatted tags from tag array 
* commit 'df81262bcb8f83fc770dbbec253c45f17e38dad9':
  AudioAttributes: always build formatted tags from tag array
 2014-08-01 18:01:51 +00:00
Eric Laurent
4309f95f72 am 991bd713: Merge "unhide AudioFormat getters" into lmp-dev 
* commit '991bd7131a82851e389d8c40e95e28724b4d3aa8':
  unhide AudioFormat getters
 2014-08-01 18:01:49 +00:00
Torne (Richard Coles)
347d32d7f5 am 988108e8: am 3ca863fd: Merge "Fix WebViewUpdateService timeout code." into lmp-dev 
* commit '988108e80849a115fc0bc95aeb852b1e0793cd8c':
  Fix WebViewUpdateService timeout code.
 2014-08-01 18:01:47 +00:00
Jean-Michel Trivi
2a479da5f9 am d6a832db: AudioAttributes: always build formatted tags from tag array 
* commit 'd6a832db5fa8e01b4a8564f7eda667c69e2e7615':
  AudioAttributes: always build formatted tags from tag array
 2014-08-01 17:56:45 +00:00
Behdad Esfahbod
fb72b6b10f Merge "Add fontFeatureSettings to TextView and attrs" into lmp-dev 2014-08-01 17:53:35 +00:00
Behdad Esfahbod
e9ad3931fa Add fontFeatureSettings to TextView and attrs 
New API is hidden.

Bug: 15246510
Change-Id: I8cdbbd3a36fc280e07569dbb130f8c237062fff5
 2014-08-01 21:35:05 +00:00
Torne (Richard Coles)
22a3bc8bbc am 3ca863fd: Merge "Fix WebViewUpdateService timeout code." into lmp-dev 
* commit '3ca863fd6a6978428317bb592212afb24ca03e57':
  Fix WebViewUpdateService timeout code.
 2014-08-01 17:52:35 +00:00
Jean-Michel Trivi
cc58c76cf0 AudioAttributes: always build formatted tags from tag array 
An AudioAttributes instance can either be built through the
 Builder, or from unmarshalling: the mFormattedTags field
 should always be in sync with the array of tags.
In toString() method, use the more compact mFormattedTags.

Change-Id: Ie06cd7758bf4f2d2693fedaa8c3ba4245802d921
 2014-08-01 17:51:46 +00:00
John Spurlock
64fc3282f2 am 58062fce: am 6cb493b3: Volume: Confirm unsafe media volume dialog on VOL_UP. 
* commit '58062fceea1b66642b5788a498b56b754530e7c2':
  Volume: Confirm unsafe media volume dialog on VOL_UP.
 2014-08-01 17:21:34 +00:00
John Spurlock
a3a1c8bcca am 6cb493b3: Volume: Confirm unsafe media volume dialog on VOL_UP. 
* commit '6cb493b3fd2947b35aa5f98a20c8831df67a3e35':
  Volume: Confirm unsafe media volume dialog on VOL_UP.
 2014-08-01 17:17:01 +00:00
John Spurlock
2d28d6e1af Volume: Confirm unsafe media volume dialog on VOL_UP. 
If the confirmation dialog is showing, consider a new
VOL_UP as a confirmation.

Bug:16540877
Change-Id: Ibdaa43ea423cc3b48d234bcaaa0c542178657b6c
 2014-08-01 13:10:14 -04:00
John Spurlock
0c2d5a1013 am 68366de3: am ce3d86e2: Merge "QS: Back button closes detail (if showing)" into lmp-dev 
* commit '68366de3bc560650f1f40b1ce7d29abbfb5297a5':
  QS: Back button closes detail (if showing)
 2014-08-01 16:58:26 +00:00
Ben Murdoch
a7b5cbd3fb am 503115e9: am f3fc680c: Merge changes I2f40be36,I4af9fd7e,Ib0b4245f,I55acad96,Id276b71e, ... into lmp-dev 
* commit '503115e9d59dc0cacff8e58931e913d77ed1acf5':
  Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE
  Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE
  CHerry pick Find WebView package name from a config resource. DO NOT MERGE
  Cherry pick Remove dependency on WebView native library path. DO NOT MERGE
  Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
  Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE
  Cherry pick Refactor native library path logic in WebViewFactory DO NOT MERGE
  Cherry pick Append WebView assets to AssetManager when loading the WebView. DO NOT MERGE
  Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE
  Cherry pick Load the WebView Java code from an APK. DO NOT MERGE
 2014-08-01 16:54:20 +00:00
John Spurlock
5fd224aecb am ce3d86e2: Merge "QS: Back button closes detail (if showing)" into lmp-dev 
* commit 'ce3d86e22da8a0659c4d480d87a77b8fa0968bc7':
  QS: Back button closes detail (if showing)
 2014-08-01 16:54:16 +00:00
Sandeep Siddhartha
53cdc2e783 am 578d6d07: am 6044598c: Cleanup some documentation with @see references to constants 
* commit '578d6d0797efe1c29bac8b70e5d9e7f69613068f':
  Cleanup some documentation with @see references to constants
 2014-08-01 16:54:15 +00:00
Ben Murdoch
57652524dc am f3fc680c: Merge changes I2f40be36,I4af9fd7e,Ib0b4245f,I55acad96,Id276b71e, ... into lmp-dev 
* commit 'f3fc680ca61e0c31c924e95afe1e2ac0368994ae':
  Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE
  Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE
  CHerry pick Find WebView package name from a config resource. DO NOT MERGE
  Cherry pick Remove dependency on WebView native library path. DO NOT MERGE
  Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
  Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE
  Cherry pick Refactor native library path logic in WebViewFactory DO NOT MERGE
  Cherry pick Append WebView assets to AssetManager when loading the WebView. DO NOT MERGE
  Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE
  Cherry pick Load the WebView Java code from an APK. DO NOT MERGE
 2014-08-01 16:50:07 +00:00
Sandeep Siddhartha
ab03bfcf52 am 6044598c: Cleanup some documentation with @see references to constants 
* commit '6044598cdc19b77a6c681ea8fdba777cc3e983c9':
  Cleanup some documentation with @see references to constants
 2014-08-01 16:50:02 +00:00