Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,516 Commits 3 Branches 0 Tags
ded25aed8eabe39976217f767554f0f92bf01e44
Commit Graph

68316 Commits

Author SHA1 Message Date
Mark Renouf
9a21708ec6 Allow power button to close an input method am: d28e907183 
am: 8da4ced46c

Change-Id: Id6ab4bd72f1516f29900c12af31a097047e8b7fd
 2016-12-01 01:34:33 +00:00
Mark Renouf
8da4ced46c Allow power button to close an input method 
am: d28e907183

Change-Id: I0324d14bde85e3461d0fe605f3b83496b25b9c75
 2016-12-01 01:29:11 +00:00
Stephen Chen
23ea4627d6 Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." am: 6e54c31f0a am: 6ef2ec0d80 
am: 6d7e85cb6b

Change-Id: Id5874da0cc2a36297c1e3578f8f62cc4a0026edf
 2016-12-01 00:13:38 +00:00
Stephen Chen
6d7e85cb6b Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." am: 6e54c31f0a 
am: 6ef2ec0d80

Change-Id: I2f36c6d7dc284605b490f9793f17d713bc622063
 2016-12-01 00:09:17 +00:00
Stephen Chen
6ef2ec0d80 Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." 
am: 6e54c31f0a

Change-Id: Ie3b4a3ed5e2858ce2b3446c300c984875201205c
 2016-12-01 00:02:58 +00:00
vinodkrishnan
7e88808cd5 Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 
am: 60d4248fdc

Change-Id: Ia9d1ffc4b2d37b8a27173dccbb4e1cb518e8f712
 2016-11-30 22:01:52 +00:00
vinodkrishnan
afd52a7ad4 Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" 
am: 7b62df8556

Change-Id: I7c8d922fb125bf786990642679ebdd17ba589a54
 2016-11-30 21:52:13 +00:00
vinodkrishnan
60d4248fdc Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" 
am: 7b62df8556

Change-Id: Iec37684da3fa447d55498e6c8302fb229fa28373
 2016-11-30 21:52:05 +00:00
Mark Renouf
d28e907183 Allow power button to close an input method 
BUG: 33038203
Change-Id: I5c44dc49db6b960b4e3e42545bfbbab62f357f08
 2016-11-30 16:01:42 -05:00
Treehugger Robot
6e54c31f0a Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." 2016-11-30 20:25:13 +00:00
vinodkrishnan
7b62df8556 Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" 
This reverts commit 8500f26d51.

Change-Id: I6408fa3f307d7611443e26b24d3876c1a1f92fdc
 2016-11-30 20:09:59 +00:00
Phil Weaver
84a0d97b85 Don't invalidate list data during layout. 
am: a9d976f39a

Change-Id: I865fda193961bb0e5229cba1034b818572662001
 2016-11-30 18:00:54 +00:00
Phil Weaver
d1b7d3262b Merge "Don't invalidate list data during layout." into nyc-mr2-dev 2016-11-30 17:51:42 +00:00
Stephen Chen
767e453cdf Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings. 
Exposes an activity that deep links into saved network Settings.

Bug: 32738882
Test: gts test
Change-Id: Ic639b7543439bbe52941fa58a74a767a4a0f8a76
 2016-11-28 16:26:16 -08:00
Hall Liu
a95fc5fea8 Merge "Add removeState method to StateMachine" am: 0310de1136 am: 01106c45ca 
am: 1a8bdf8bf9

Change-Id: I54cbb26c9f68edb07aca4e8054750c665a33098f
 2016-11-28 21:15:11 +00:00
Hall Liu
1a8bdf8bf9 Merge "Add removeState method to StateMachine" am: 0310de1136 
am: 01106c45ca

Change-Id: I4f31491b1c9db29fe14222788d7fbd1fd6bce068
 2016-11-28 21:06:44 +00:00
Hall Liu
01106c45ca Merge "Add removeState method to StateMachine" 
am: 0310de1136

Change-Id: Ib7d8e435c76bc7bcd83d6350c3c0622bb44d6552
 2016-11-28 20:58:43 +00:00
Hall Liu
b222d2045d Add removeState method to StateMachine 
Method to be used by BluetoothRouteManager in Telecom.

Test: unit tests in Telecom
Change-Id: Icdd1a3d42224246a5f26100fabb26313ce83b14c
 2016-11-23 11:52:58 -08:00
Baligh Uddin
39677cea6a Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp 2016-11-23 17:56:36 +00:00
Jakub Pawlowski
0debe3c5b7 Merge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e5596 
am: e8ceb15b51

Change-Id: I21eb000be58fd61b238e2401cf266b6f132acc83
 2016-11-23 02:08:12 +00:00
Jakub Pawlowski
e8ceb15b51 Merge "Bluetooth: report proper advertiser status on error" am: b509957e62 
am: 673c0e5596

Change-Id: Ic91b1c614e9cc71e7d57bd39ac31ec1127f08f65
 2016-11-23 02:03:13 +00:00
Jakub Pawlowski
673c0e5596 Merge "Bluetooth: report proper advertiser status on error" 
am: b509957e62

Change-Id: I1bb0a029a9044c3931e158c7ef02ffee4cb0f1cd
 2016-11-23 01:58:03 +00:00
Baligh Uddin
b1df48d326 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger 
Bug: 32849428

* goog/cw-f-dev: (98 commits)
  Revert "Catch KeyStoreException for setting profile lock"
  Fix createConfirmDeviceCredentialIntent for wear for CTS.
  Fix default dialog background colour for watch devices.
  Catch KeyStoreException for setting profile lock
  Add cross-links between FINE and COARSE location permissions. bug: 25371600
  Fixed a bug with the emergency affordance in multi user
  Zygote: Additional whitelists for runtime overlay / other static resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  colors: add missing accent_material_{700,50} resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
  ...

Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
 2016-11-22 17:19:45 -08:00
Jakub Pawlowski
76f517a173 Bluetooth: report proper advertiser status on error 
When advertiser is not started because too many advertisers are
registered, return proper error code.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I57384ff30132e9a7ee17dcf191ff89baa7abf1ef
 2016-11-22 13:38:15 -08:00
Martijn Coenen
d42b1d01ca Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb 
am: 201cf4fb27

Change-Id: Ibd379f588dacbf571948d34d76abb0e6f12f3a79
 2016-11-22 10:00:36 +00:00
Martijn Coenen
201cf4fb27 Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f 
am: 8c05ff96fb

Change-Id: Ib406f48dc35ecededd89ed8ed8750622a26d9ee2
 2016-11-22 09:55:03 +00:00
Martijn Coenen
8c05ff96fb Merge "Add SystemProperties.reportSyspropChanged()." 
am: 45c0c6939f

Change-Id: I83890872ba76161cf2f9a35b23861ab21b452a0f
 2016-11-22 09:49:15 +00:00
Treehugger Robot
45c0c6939f Merge "Add SystemProperties.reportSyspropChanged()." 2016-11-22 09:43:23 +00:00
Jeff Sharkey
55727aaede Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1 
am: 3391f3376e

Change-Id: I942f9c44a8c3b1abf39694816a34790df3e224ad
 2016-11-21 21:58:02 +00:00
Jeff Sharkey
3391f3376e Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 
am: db5ed5beb1

Change-Id: Id6ce5cfedab250f25c0eb8b0c49971e9e20cbeb2
 2016-11-21 21:48:31 +00:00
Jeff Sharkey
db5ed5beb1 Merge "StrictMode to detect untagged network traffic." 
am: 67fe28d925

Change-Id: I52cdce87d87ec503294e431c8f22e87235bdbf79
 2016-11-21 21:43:58 +00:00
Treehugger Robot
67fe28d925 Merge "StrictMode to detect untagged network traffic." 2016-11-21 21:33:15 +00:00
Jeff Sharkey
8984897502 Merge "Stub Binder API." am: 4db1632b3a am: 313456c975 
am: c61a8e01a3

Change-Id: Id40456a710ce24f1af98b8e70a894a1fbe8d0690
 2016-11-21 20:31:28 +00:00
Jeff Sharkey
c61a8e01a3 Merge "Stub Binder API." am: 4db1632b3a 
am: 313456c975

Change-Id: Icc2db98a8ab325ca4bc7456abe5963c293a878cb
 2016-11-21 20:26:22 +00:00
Jeff Sharkey
313456c975 Merge "Stub Binder API." 
am: 4db1632b3a

Change-Id: I00e7f39d525a1d6af9a07b192294060113a2f7c2
 2016-11-21 20:21:25 +00:00
Jeff Sharkey
4db1632b3a Merge "Stub Binder API." 2016-11-21 20:10:29 +00:00
Jeff Sharkey
763a140796 StrictMode to detect untagged network traffic. 
Define some constants for early use in AOSP code.

Test: builds, boots, all common traffic tagged
Bug: 30943431
Change-Id: Ia58a8933bccfddbc027afb78c63ae65bd71ce562
 2016-11-21 12:15:16 -07:00
Nancy Zheng
2a12d8520e Fix createConfirmDeviceCredentialIntent for wear for CTS. am: 43f166dfb4 
am: a2193c0b76

Change-Id: I9f216231ff600972e3ddec195158fc2489693a1e
 2016-11-21 18:25:12 +00:00
Nancy Zheng
a2193c0b76 Fix createConfirmDeviceCredentialIntent for wear for CTS. 
am: 43f166dfb4

Change-Id: Icda6d5182ff20c4db150ae3f0351e559682184de
 2016-11-21 18:19:48 +00:00
Jeff Sharkey
1324531355 Stub Binder API. 
Provide a stub API for AOSP code to call.

Test: builds
Bug: 32715088
Change-Id: Iab74d269e795a722e82fd3fa304200d57d152f57
 2016-11-21 18:11:25 +00:00
Martijn Coenen
0754b27b56 Add SystemProperties.reportSyspropChanged(). 
To support notifying libutils of system property
changes.

Bug: 31262344
Test: builds
Change-Id: Iea77532eaa84d00f7d640edd1e3a1da66afdadc5
 2016-11-21 17:57:13 +00:00
Torne (Richard Coles)
7e17c6b0f1 Merge "Precreate the classloader for the WebView." am: 566b1c80e4 am: 1feb782f01 
am: 9565860b08

Change-Id: I070288a127cbaa08f05b49f66e23ea0ec298040b
 2016-11-21 17:13:45 +00:00
Torne (Richard Coles)
9565860b08 Merge "Precreate the classloader for the WebView." am: 566b1c80e4 
am: 1feb782f01

Change-Id: Iec0bf848e4c25afc6a6b9ee83339a03f314adee9
 2016-11-21 17:08:46 +00:00
Torne (Richard Coles)
1feb782f01 Merge "Precreate the classloader for the WebView." 
am: 566b1c80e4

Change-Id: Ic79079748dae515cb8d89ef99148755ac65f1d47
 2016-11-21 17:04:22 +00:00
Treehugger Robot
566b1c80e4 Merge "Precreate the classloader for the WebView." 2016-11-21 16:54:53 +00:00
Torne (Richard Coles)
3b6ca99b10 Precreate the classloader for the WebView. 
We want to create the classloader for the WebView in advance in the
zygote so that it can preload Java and native code for its children, but
the zygote can't talk to the package manager (so doesn't have a
PackageInfo for the APK) and also doesn't have an ActivityThread, so
constructing a LoadedApk is difficult.

Instead, we use the fact that ApplicationLoaders contains a
process-global cache of classloaders for APKs, and prepopulate a cache
entry without constructing a LoadedApk. This requires making
ApplicationLoaders public. To calculate the correct library paths from
the information the zygote has, we reuse the logic in LoadedApk (which
is already public, and just needs a small change to allow a null
ActivityThread when checking for instrumentation).

The other parameters for classloader creation (target SDK, bundled app,
etc) are hardcoded to usable values for the WebView's case. WebView
never needs to use any system libraries that aren't public so claiming
it's not bundled is fine even when that isn't actually true, and WebView
will always target the current platform API level.

Once the classloader is created, look up the factory class and call
preloadInZygote on it to give it a chance to preload the native library
and do other shared initialisation.

Bug: 21643067
Test: enable multiprocess WebView, examine librank output to see sharing
Change-Id: I696ead637e3f7382bcc58cfaf61eac5921862015
 2016-11-21 15:04:13 +00:00
Nancy Zheng
43f166dfb4 Fix createConfirmDeviceCredentialIntent for wear for CTS. 
Bug: 33000237
Change-Id: I1fdb5a518c41ab005f12d3142763e374b38d7553
 2016-11-18 18:15:09 -08:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40 
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
 2016-11-17 00:39:07 +00:00
Jerry Zhang
fb4a03c8f8 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 
am: 5cbd151d40

Change-Id: Ie2920ff5a89c5eee28a31803f9775920289e41c4
 2016-11-17 00:24:41 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method. 
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
 2016-11-17 00:12:50 +00:00