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

170739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
7e6713fc08 am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP] 
* commit '13b2951910178e8e7fc4fae1e3f700038621be98':
  docs: setup-virtual-device [CP]
 2014-12-08 19:38:48 +00:00
Rich Slogar
b5c81893e7 am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP] 
* commit 'bc683297e36a188a45c7c54558d8c27dd6feda48':
  docs support library updates [CP]
 2014-12-08 19:38:42 +00:00
Rich Slogar
cdad9919ce am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP] 
* commit '2bba0c94f3e7726cc58d470094acd116db4ab36b':
  docs: debugging studio [CP]
 2014-12-08 19:38:36 +00:00
Rich Slogar
059b6ef35c am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP] 
* commit '46150b5f20098d3902495dde1c9f978f0d69ca0e':
  docs:setting up hardware devices [CP]
 2014-12-08 19:38:30 +00:00
Rich Slogar
44176d92e0 am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP] 
* commit '5da1430e7e838e7a36482d605ee3fad121afe0f6':
  docs: workflow index [CP]
 2014-12-08 19:38:25 +00:00
Rich Slogar
0622234bcc am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP] 
* commit '359e5597a9f890002f4bd2a66caa52100fa0defb':
  docs: tools help update [CP]
 2014-12-08 19:38:17 +00:00
Scott Rowe
46f7dcf1e4 am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP] 
* commit '43883b11dec935aa545ee0cbb3660d0b84c36a53':
  docs: Training refactor for Android Studio [CP]
 2014-12-08 19:37:50 +00:00
Jinsuk Kim
62bb43dbec am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 
* commit '122e704a017b51ffd3da0721059d04f00c726ce8':
  CEC: Avoid setting op in disabled mode
 2014-12-08 19:37:44 +00:00
David Friedman
587d349eff am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d. 
* commit 'cac94aa0791b04fd328b18c56da3d4815f142fe7':
  Fixes (updates) download links for NDK r10d.
 2014-12-08 19:37:37 +00:00
Jeff Davidson
5550a408c4 am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev 
* commit '5b8c5dd41e386e696d7e8705f84982a91d1596ae':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
 2014-12-08 19:36:46 +00:00
Jeff Davidson
0efd29fc57 am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit '386effc7a160e330420f7746f41d46c12f64579d':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-08 19:36:39 +00:00
Jeff Davidson
820ba1f96f am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev 
* commit '401ef259f3b2c8c87b02c9939c0599d6ad0f6f39':
  add disable Ephemeral Network API Bug:18525241
 2014-12-08 19:36:33 +00:00
Jeremy Joslin
d4753450f3 am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
  Don't send the same PendingIntent more than once.
 2014-12-08 19:36:27 +00:00
Evan Charlton
1b001caed3 am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev 
* commit '068a078645b5f146c09a986398eda9df24d1ef3e':
  Associate a UserHandle with each PhoneAccountHandle
 2014-12-08 19:36:21 +00:00
Paul Jensen
446a59bc26 am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit 'a4afe13af38c03ae6abb76d2cf36ae0672328fd8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-08 19:36:08 +00:00
Jeff Tinker
f062d8d7df am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev 
* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
  Unhide secure stop APIs
 2014-12-08 19:35:59 +00:00
Jinsong Mu
5a181a2436 am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 
* commit '6fac0351cebf84cf9505246e1fec5d74a1fa49c0':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-08 19:35:31 +00:00
Ihab Awad
657f25e964 am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-08 19:35:17 +00:00
David Friedman
ad9e0d5ed5 am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit '7823e6ee900547e32436d3c76f1709c926d08284':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-08 19:34:38 +00:00
RoboErik
b22eea724b am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7':
  Route mute key events through MediaSessionService
 2014-12-08 19:34:32 +00:00
Quddus Chong
0d9d5d0a83 am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit 'e6000f475346624587caa09cec37c85c3ab61ee8':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-08 19:34:16 +00:00
Quddus Chong
a40c6b0479 am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit 'f428952e093239bce7c11eccc547a5094066c73f':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-08 19:34:08 +00:00
Wale Ogunwale
30b74ccf69 am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev 
* commit '80d119121f62bf995ff856f6865a977eb8c03239':
  Don't destroy surfaces of activities launched behind early.
 2014-12-08 19:34:01 +00:00
Filip Gruszczynski
73f0e9a3fe am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 
* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
  Fix calculation of overscan insets in WindowState.
 2014-12-08 19:33:55 +00:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-08 19:33:49 +00:00
ztenghui
4cb33e7657 am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 
* commit '550348220e959ff3c98b88c191a849ea2ee6062a':
  Fine tune the light radius from 800dp to 600dp
 2014-12-08 19:18:13 +00:00
Sanket Padawe
17c2719d03 am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '49aeee2e791ec85a1c2f202d29e7113dc9d9cae0':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-08 19:17:45 +00:00
Eino-Ville Talvala
b71d983a7f am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 
* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.
 2014-12-08 19:17:38 +00:00
Eino-Ville Talvala
cfdc0762e2 am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev 
* commit '3e3ae5b71590ce4272afaa5db1a1ff1fb26f4f6b':
  Fix docs build
 2014-12-08 19:17:31 +00:00
Stuart Scott
6b0025ea7c am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 
* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
  Add mapping between RAT and Network Mode
 2014-12-08 19:17:22 +00:00
Jing Zhao
8d50d0fb27 am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
* commit '23ad6efbf81f1ea4f1e7b24ee0ca623045063b2f':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature
 2014-12-08 19:17:16 +00:00
Chris Wren
d4ba216a0f am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit 'ea9abd14dc4d4028f74b079c0462dec4fa7d6d18':
  Avoid race condition in heads up snooze code path.
 2014-12-08 19:17:09 +00:00
Christopher Tate
a2a5d4d043 am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 
* commit '41b0cbb3a6e6e51ae75a971c3c6b6e36950a2bf5':
  Correctly parse previous PMBA state during backup
 2014-12-08 19:17:00 +00:00
Christopher Tate
bd2d8202e3 am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 
* commit 'a42d95f1bc89dbbb4d34c62dac20ba3d9541603a':
  Tune delivery and batching of alarms
 2014-12-08 19:16:54 +00:00
Pavel Zhamaitsiak
913c989546 am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-08 19:16:43 +00:00
Justin Harrison
e0b2fa5c57 am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
  Add UUID for Pbap client
 2014-12-08 19:16:37 +00:00
Ihab Awad
91fd77283b am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev 
* commit '9ae44f927d678ae4b38259be2ce0601aa215e3b1':
  Relax access on deprecated fields for compatibility.
 2014-12-08 19:16:31 +00:00
Dan Sandler
b3014b0f3a am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit '9e3adb821bef924cac5fb21f1e6c539495f3e831':
  RTL support for Lollipop Land.
 2014-12-08 19:16:26 +00:00
Fyodor Kupolov
d483a85e69 am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
  Added isRemovingAdmin method
 2014-12-08 19:16:12 +00:00
Amith Yamasani
333c4a968e am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev 
* commit '50734b700974bda5d955e61a8ae61e308a4dc8ad':
  Correct check of is user running
 2014-12-08 19:16:02 +00:00
Cheuksan Wang
673f443f7e am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 
* commit '695b5d25879e894d381e95017b9ce5166adbb09f':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
 2014-12-08 19:15:57 +00:00
Amith Yamasani
81b27f4c9f am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev 
* commit 'b2905092d6779349834635c6343556017c0c998e':
  Potential fix for accidental deactivation of profile owner
 2014-12-08 19:15:50 +00:00
ztenghui
9bb5cef91f am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 
* commit '971fe6d66419065b96b46a20b7110ba435fa3a9a':
  AVD: Deep copy the animator target setup when mutate.
 2014-12-08 19:15:36 +00:00
Clare Bayley
2bfb88ca6e am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit 'fb569013c2b34acb58adc956a12c0f2581028e33':
  Updating screenshots to LMP release and N6
 2014-12-08 19:15:26 +00:00
RoboErik
0713f94493 am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 
* commit 'e9905bd489cd6fcb75203b97a3a7d60b95329a6a':
  Make setting the session token in MediaBrowserService synchronous
 2014-12-08 19:15:18 +00:00
Dan Sandler
c92c94a5b6 am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit '2f6d30dfe60826027af9b59d80c536e8f424545d':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-08 19:15:06 +00:00
Benjamin Franz
f4a76651b0 am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.
 2014-12-08 19:14:56 +00:00
Justin Harrison
79e346fe1b am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit '66351d623acfe67033c605cce4a5d52faab3fb96':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-08 19:14:38 +00:00
Raph Levien
72ebd648b7 am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev 
* commit '1a7bac35da420bbdf2ed7c2220ad0058abf4d091':
  Add 8 more scripts to the font fallback chain.
 2014-12-08 19:14:32 +00:00
Dongwon Kang
6077acaf14 am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev 
* commit 'bfc9739b1c1d57f388a8be62e99f3592f08ad9b3':
  TIF: handle a race condition when a session is crashed
 2014-12-08 19:14:20 +00:00