Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julius D'souza
4e9400ab27 DO NOT MERGE: Sync with master: Add initial ambient light sensor rate am: 5c7ae14148 
am: a83f940349

Change-Id: I9d70652892014783ec444d3c38f3a1aef546de78
 2016-12-01 22:40:43 +00:00
ltrochtova
ec72bbb5c1 Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f -s ours am: 834725f579 am: 96fe993907 
am: 46eb3f6cdb

Change-Id: Ib65ebb040db72ada2286e73a0d0d5b8c88f88814
 2016-12-01 22:36:08 +00:00
Julius D'souza
829c45d5be Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev 
am: afccacad68

Change-Id: I6e59afddfc4cb73a1cf913b6799a4c6545464c7b
 2016-12-01 22:35:46 +00:00
Julius D'souza
c8df3b4db8 Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev 
am: afccacad68

Change-Id: I9b6870028ce598c4c9066031c4706dbb0555c38d
 2016-12-01 22:35:42 +00:00
Julius D'souza
c384a24668 DO NOT MERGE: Sync with master: Add initial ambient light sensor rate 
am: 5c7ae14148

Change-Id: I998a032daf0eadf9be003969505958acc1965693
 2016-12-01 22:35:41 +00:00
Julius D'souza
a83f940349 DO NOT MERGE: Sync with master: Add initial ambient light sensor rate 
am: 5c7ae14148

Change-Id: I5020bc4caba313eda5b7a8b2bdcf3e9f348b2f95
 2016-12-01 22:35:39 +00:00
Michael Rosenfeld
3d76f235e3 Merge "Add command line action sequencing." am: 880c9acf4a am: 3711f2f0c2 am: 2f5f210f7d 
am: c853f3a5ff

Change-Id: Id157a2d7afc5c49967d804edb734c4b277bf0d20
 2016-12-01 22:34:03 +00:00
Android Build Merger (Role)
d758eda3c0 Merge changes from topic 'am-cf1d9b40771c43ef84f49f7752a3174b' 
* changes:
  Merge "Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470" into nyc-mr1-dev-plus-aosp am: c428921847 am: 50d2802a7e
  Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470 am: 61eb0bf8fc am: 257ed21d93
 2016-12-01 22:30:36 +00:00
Etan Cohen
041314173f Merge "Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470" into nyc-mr1-dev-plus-aosp am: c428921847 
am: 50d2802a7e

Change-Id: Ic852914c22406519e07209c9b867bb6a48ec5d6d
 2016-12-01 22:28:39 +00:00
Adrian Roos
1381047f42 Merge "Lockscreen: Restrict double taps to prevent falsing" 2016-12-01 22:28:24 +00:00
Etan Cohen
8574c88237 Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470 am: 61eb0bf8fc 
am: 257ed21d93

Change-Id: I59d444dc877f07b3a9c9e5f3286c708cd0d6c0e9
 2016-12-01 22:26:59 +00:00
TreeHugger Robot
56e047a7f9 Merge "CameraDevice: Add missing @Nullable for a handler argument." 2016-12-01 22:26:24 +00:00
Julius D'souza
afccacad68 Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev 2016-12-01 22:26:06 +00:00
Chad Brubaker
2900d4d155 Add single use App specific incoming SMSes 
This allows applications to request that an upcoming incoming SMS be
routed directly to the calling application and to do so without
needing the RECEIVE_SMS permission.

This is especially important for ephemeral applications which we do not
want to have the ability to get the RECEIVE_SMS permission but do want
to support SMS based phone number verification. Ephemeral apps can use
this API to receive and SMS from their backend but will not be able to
access other SMSes on the device.

This is done by providing the app a token which when included in a
subsequent SMS message causes the application provided PendingIntent to
be sent with the SMS message data attached.

Test: Verified that an SMS containing the code is routed to the app.
Test: runtest --path GsmInboundHandlerTest.java
Test: cts-tradefed run cts -m CtsPermission2TestCases

Bug: 33047670
Change-Id: Iea60bfd1d3f9b8f013b34a82a480c65006416c4c
 2016-12-01 14:25:07 -08:00
Robert Greenwalt
c8fabf2cd0 Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp am: e2e654f892 
am: fe968c40f6

Change-Id: Ie89ed98c5159e211ff70a819b4ea87dea65c1a5c
 2016-12-01 22:23:39 +00:00
Zoran Jovanovic
8eace23224 Get the correct operator name am: 67f579be19 
am: fc36f2f260

Change-Id: I56d8d187b4fbb3f8c54fbffecae0ed0982f0cfbe
 2016-12-01 22:22:46 +00:00
Matthew Ng
ae1ff4f85f Split home stack into home and recents stack 
Refactored functionality of home stack (HOME_STACK_ID) in the code
base to home stack and recents stack (RECENTS_STACK_ID). Also changed
function and variable names from homeStack to homeOrRecentsStack.

Differentiating home and recents stack will allow readablilty and
managing logic between home and recents stacks. For example, for
multi-window minimized dock state, the home and recents stacks can
be set to different rects where the home stack needs to be a fixed
large size while the recents stack is hidden and the dock stack is
animating to be minimized.

Fixes: 32839371
Test: ./run-test android.server.cts and manually tested split and
rotation
Change-Id: I7603359c2dc20e35924664178634eb761e0367a6
 2016-12-01 14:20:56 -08:00
Wei Jia
400752a790 Merge "MediaPlayer: enable same seek modes as in MediaMetadataRetriever." 2016-12-01 22:08:11 +00:00
ltrochtova
46eb3f6cdb Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f -s ours am: 834725f579 
am: 96fe993907

Change-Id: I6f3b70920942f03549c60f55437855e1f7c31f22
 2016-12-01 22:07:36 +00:00
Michael Rosenfeld
c853f3a5ff Merge "Add command line action sequencing." am: 880c9acf4a am: 3711f2f0c2 
am: 2f5f210f7d

Change-Id: I10c2d3c3be0bb8748602b3a566f75f8c687f8889
 2016-12-01 22:05:22 +00:00
Etan Cohen
50d2802a7e Merge "Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470" into nyc-mr1-dev-plus-aosp 
am: c428921847

Change-Id: I3b31d46d4e21b66caedeb78385197b079b60eb5f
 2016-12-01 22:03:44 +00:00
Etan Cohen
257ed21d93 Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470 
am: 61eb0bf8fc

Change-Id: Ieac0ca72361be082f99f6ab3be89d7f1662b0e6b
 2016-12-01 22:03:29 +00:00
Jeff Sharkey
3f39991889 Merge "Add 'fstrim' command for use from shell." 2016-12-01 22:03:08 +00:00
Jeff Sharkey
fb833f38a0 Detect content:// leaving apps without grants. 
Developers regularly put content:// Uris into Intents, but they can
easily forget to add FLAG_GRANT_READ_URI_PERMISSION to actually
extend a permission grant to the receiving app.

Also fix NPE when path is missing.

Test: builds, boots, common actions work without triggering
Bug: 32447617, 31900890
Change-Id: Ic6054b1d73de50967cf7fe66abc293c60a41b97e
 2016-12-01 15:01:19 -07:00
ltrochtova
2ca3642c95 Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92 -s ours am: 0a21ba22e3 am: 6a3e0921fe 
am: ecb5e3a665

Change-Id: I114ca5f59473119a7f9f732fc8cfafcf03fa1251
 2016-12-01 21:58:21 +00:00
Robert Greenwalt
fe968c40f6 Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp 
am: e2e654f892

Change-Id: Idfd43e8be39479c67288e58c5045530cd5b97eaf
 2016-12-01 21:57:50 +00:00
Zoran Jovanovic
fc36f2f260 Get the correct operator name 
am: 67f579be19

Change-Id: Ia822adfdcfa47f7ec0b95cc44b48ab3a1bd75961
 2016-12-01 21:57:44 +00:00
ltrochtova
96fe993907 Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f -s ours 
am: 834725f579

Change-Id: Idda7a70676bb3d6ac028482064c22e61180768f6
 2016-12-01 21:57:04 +00:00
ltrochtova
ecb5e3a665 Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92 -s ours am: 0a21ba22e3 
am: 6a3e0921fe

Change-Id: I6bfce1299a429a8cf3a42b2d265550a588f7f5d9
 2016-12-01 21:53:41 +00:00
Michael Rosenfeld
2f5f210f7d Merge "Add command line action sequencing." am: 880c9acf4a 
am: 3711f2f0c2

Change-Id: I8fae92c813fd7c2d3488b38217420affc5540c08
 2016-12-01 21:51:56 +00:00
Zoran Jovanovic
47495ebad0 Get the correct operator name 
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
 2016-12-01 21:50:14 +00:00
Android Build Merger (Role)
c428921847 Merge "Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470" into nyc-mr1-dev-plus-aosp 2016-12-01 21:49:17 +00:00
ltrochtova
834725f579 Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" 
am: 4eb075e89f  -s ours

Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158
 2016-12-01 21:48:07 +00:00
Etan Cohen
61eb0bf8fc Merge "AWARE: Abstract structure of match filters" am: f358a69cba 
am: 7f12aa5470

Change-Id: I6d70ec6234752e2d84ad72dcbcbb15dfad6ad5d1
 2016-12-01 21:48:02 +00:00
Robert Greenwalt
6f8577e319 Merge "Get the correct operator name" 2016-12-01 21:46:51 +00:00
Robert Greenwalt
e2e654f892 Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp 2016-12-01 21:46:51 +00:00
ltrochtova
6a3e0921fe Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92 -s ours 
am: 0a21ba22e3

Change-Id: I6460fb58be9ecac4bbd4f13ad61537704bd4a150
 2016-12-01 21:43:41 +00:00
Michael Rosenfeld
3711f2f0c2 Merge "Add command line action sequencing." 
am: 880c9acf4a

Change-Id: I81b31d950e0dca525fbfe9aa38c9c113eea7cec8
 2016-12-01 21:40:06 +00:00
TreeHugger Robot
4a3818ddd3 Merge "Fix a crash in skia pipeline, when empty reorder block is first" 2016-12-01 21:36:01 +00:00
Etan Cohen
7f12aa5470 Merge "AWARE: Abstract structure of match filters" 
am: f358a69cba

Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a
 2016-12-01 21:35:05 +00:00
ltrochtova
0a21ba22e3 Merge "Introduce a new user restriction for disallowing Bluetooth." 
am: 1e9a5eac92  -s ours

Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029
 2016-12-01 21:31:23 +00:00
ltrochtova
4eb075e89f Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" 2016-12-01 21:20:43 +00:00
TreeHugger Robot
0886400bc7 Merge "Show keyguard when SIM is removed" 2016-12-01 21:14:13 +00:00
Makoto Onuki
1e86e6eb1a Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev am: 986d88d7fe 
am: 287fa3404c

Change-Id: If861e34f9b4633ce9b64d508d76616010032ce62
 2016-12-01 21:03:33 +00:00
Makoto Onuki
b36c45fe30 Fix issue with apps restored to lower versions. am: fac592f64c 
am: affadd52af

Change-Id: I159f53023179cb67b7225969f4c7220ddd0c03dc
 2016-12-01 21:02:35 +00:00
Makoto Onuki
287fa3404c Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev 
am: 986d88d7fe

Change-Id: I2347429a663180a86e544c5ca9571fe8c6a57eda
 2016-12-01 20:57:07 +00:00
Makoto Onuki
affadd52af Fix issue with apps restored to lower versions. 
am: fac592f64c

Change-Id: I01601d1638a1ad23dcf2c57df75b81819ee3dce7
 2016-12-01 20:57:03 +00:00
ltrochtova
8874fcf97f Revert "Introduce a new user restriction for disallowing Bluetooth." 
This reverts commit 69f9d321ac.

Change-Id: I5859b262a741d1fe8e8b61e142eecf7d742d8d41
 2016-12-01 20:50:53 +00:00
Marco Nelissen
ed6824ccad Remove unneeded dependencies from libandroid_runtime 
Test: build/boot
Change-Id: I67b89c3f916f81f5efe251bba73ce204e47cfa2f
 2016-12-01 20:50:40 +00:00
Makoto Onuki
986d88d7fe Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev 2016-12-01 20:47:10 +00:00