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

302141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
4083cf1e72 Merge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e 
am: 0cf4bd3bca

Change-Id: I3b4291efeb7af34a99f016b9568d2cdee76cda87
 2017-01-09 13:14:01 +00:00
Android Build Merger (Role)
8572eecade Merge "Fix message for screen unpinning am: 8a28aa54c7 am: d4fa48aeb4" 2017-01-09 13:13:38 +00:00
Jerome Gaillard
63389daeed Merge "Update layoulib following changes in Android source code" 2017-01-09 13:12:52 +00:00
Jorim Jaggi
59b8df7bd8 Fix message for screen unpinning am: 8a28aa54c7 
am: d4fa48aeb4

Change-Id: I89a2c55a807a57ffcdc547b14b148705e6a49d32
 2017-01-09 13:12:49 +00:00
Jorim Jaggi
0cf4bd3bca Merge "Fix message for screen unpinning" into nyc-mr2-dev 
am: b0181b634e

Change-Id: I602c24f1e873386afa6680ab23ed3176463a5f6c
 2017-01-09 13:02:51 +00:00
Jorim Jaggi
d4fa48aeb4 Fix message for screen unpinning 
am: 8a28aa54c7

Change-Id: I07d9882251d7de35f785469b13164fd39bce5266
 2017-01-09 13:02:44 +00:00
Jorim Jaggi
b0181b634e Merge "Fix message for screen unpinning" into nyc-mr2-dev 2017-01-09 12:52:51 +00:00
Przemyslaw Szczepaniak
0ec8a24a94 Merge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf am: b9f1b72cb3 
am: ec12e28c82

Change-Id: I9938ed2a97f60a7234ad88be60de835ccd1671f6
 2017-01-09 11:31:17 +00:00
Przemyslaw Szczepaniak
ec12e28c82 Merge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf 
am: b9f1b72cb3

Change-Id: I003d0c134c813e06b81922c5fd044d05e7891d38
 2017-01-09 11:26:12 +00:00
Przemyslaw Szczepaniak
b9f1b72cb3 Merge "Track libcore/jsr-166 update" am: f6f36d7d9a 
am: 44cc1f23bf

Change-Id: Ic9537f84f8210960c98d64891f1267f017186763
 2017-01-09 11:21:46 +00:00
Przemyslaw Szczepaniak
44cc1f23bf Merge "Track libcore/jsr-166 update" 
am: f6f36d7d9a

Change-Id: I6ba30b86fa45403631233ede5994eac0748d9b37
 2017-01-09 11:17:06 +00:00
Charles He
31df867f7e Merge "Update SystemUpdatePolicy javadoc." 2017-01-09 11:09:58 +00:00
Przemyslaw Szczepaniak
f6f36d7d9a Merge "Track libcore/jsr-166 update" 2017-01-09 11:08:35 +00:00
Przemyslaw Szczepaniak
9e63cc2a08 Track libcore/jsr-166 update 
No functional changes.

Update after the switch from custom to openJdk-based implementation of
java.util.concurrent.CopyOnWriteArrayList class.
Tracks libcore commit 29957558cf0db700bfaae360a80c42dc3871d0e5.

Test: make -j 32
Bug: 30860904
Change-Id: I4435bc1fb5ef9fc4ee5f882370073ba8ce2bcfba
 2017-01-09 10:49:49 +00:00
Amin Shaikh
5ac6650d4a Expose fields in WifiConfiguration. 
hasNoInternetAccess and isNoInternetAccessExpected are key signals needed
to determine whether Wi-Fi should be woken up for a given saved network.

Test: make
Bug: 33224312
Change-Id: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
 2017-01-08 22:29:51 -08:00
Nick Kralevich
8ae761f703 Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87 am: a63462c794 
am: 4429993d78  -s ours

Change-Id: I541b8ec5085dd0a1a78337f57d155aa0ff0d3b68
 2017-01-08 15:28:02 +00:00
Nick Kralevich
4429993d78 Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87 
am: a63462c794

Change-Id: I2a62442a581d89054421dd6c44c610fb7ee9a0c4
 2017-01-08 15:09:21 +00:00
Nick Kralevich
a63462c794 Merge "Dumps total size of primary storage." am: 55dc66dde4 
am: 12b387dd87

Change-Id: I08e98467d212a7f9ec01b16a46540bc3d059ee51
 2017-01-08 15:04:54 +00:00
Nick Kralevich
12b387dd87 Merge "Dumps total size of primary storage." 
am: 55dc66dde4

Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86
 2017-01-08 15:00:18 +00:00
Nick Kralevich
55dc66dde4 Merge "Dumps total size of primary storage." 2017-01-08 14:53:09 +00:00
Peter Qiu
589fe00655 Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52 am: 5549acb0e6 
am: fc9579cfda

Change-Id: I5d9166a297b1fdb16d14fcd7eb83866e1be5606a
 2017-01-08 10:05:27 +00:00
Peter Qiu
fc9579cfda Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52 
am: 5549acb0e6

Change-Id: I202a51c7d32ecf747fcc32597ac574b5faac2037
 2017-01-08 07:14:30 +00:00
Peter Qiu
5549acb0e6 Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 
am: fdbc827a52

Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b
 2017-01-08 07:06:20 +00:00
Peter Qiu
fdbc827a52 Merge "wifi: hotspot2: Passpoint configuration APIs update" 
am: b1c9bc5ea5

Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5
 2017-01-08 07:00:57 +00:00
Treehugger Robot
b1c9bc5ea5 Merge "wifi: hotspot2: Passpoint configuration APIs update" 2017-01-08 06:51:52 +00:00
Felipe Leme
c0d3f0ed52
Dumps total size of primary storage. 
BUG: 32069168
Test: manual verification

(cherry picked from commit 281389ac5475e483d10a2e8aa31195b9e9875246)

Change-Id: If5dee52a99c03a00dada22736c09d953dc0b66d1
 2017-01-08 03:51:37 +01:00
Etan Cohen
d8fa1bb1f3 Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd am: dce01e235b am: baf9bb8563 
am: 8bad14363e

Change-Id: I545524b640fc1fbef547b0006fa6288bc45be7c1
 2017-01-07 20:34:49 +00:00
Etan Cohen
8bad14363e Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd am: dce01e235b 
am: baf9bb8563

Change-Id: I96c804fe006cfefb0b635f88a0f8d0e185576c3b
 2017-01-07 20:26:19 +00:00
Etan Cohen
baf9bb8563 Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd 
am: dce01e235b

Change-Id: I0e693ff19f8c08212c4daadebc3b6af33e239eda
 2017-01-07 20:18:23 +00:00
Etan Cohen
dce01e235b Merge "[AWARE] Remove reason from discovery session terminate callback" 
am: bbbe5e6ccd

Change-Id: Iede092421659c5ae55475f153d940d97dac6b7b0
 2017-01-07 20:13:33 +00:00
Etan Cohen
bbbe5e6ccd Merge "[AWARE] Remove reason from discovery session terminate callback" 2017-01-07 20:05:38 +00:00
Tomasz Wasilczyk
dcfb346761 Merge "Make metadata field mandatory for program info struct." 2017-01-07 20:03:45 +00:00
Etan Cohen
9a26e434ba Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472 am: 0bad91b5ac 
am: 0232d18805

Change-Id: Ibdb559206159eb840810f55f51545cdc797d16d6
 2017-01-07 18:48:10 +00:00
Etan Cohen
0232d18805 Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472 
am: 0bad91b5ac

Change-Id: I10da8332166d94c543ea94519af702961d3a429c
 2017-01-07 18:38:08 +00:00
Etan Cohen
0bad91b5ac Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 
am: fd23421472

Change-Id: I6ba8709fcce9e68b85811959400c5240e2a2bb36
 2017-01-07 18:29:13 +00:00
Etan Cohen
fd23421472 Merge "[AWARE] Simplify Wi-Fi Aware API namespace" 
am: 834a87d525

Change-Id: I243194a658ee8e9c5a21301601a473149eaa8a2f
 2017-01-07 18:20:31 +00:00
Etan Cohen
834a87d525 Merge "[AWARE] Simplify Wi-Fi Aware API namespace" 2017-01-07 18:12:33 +00:00
Jeff Sharkey
8d729e8c14 Merge "Initial API shape for storage statistics." 2017-01-07 16:18:38 +00:00
Jack Yu
5d14d99e43 Moved implicit intents into explicit intents 
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
Merged-In: I64db3b05400513bacf278ff9f93236495860803e
 2017-01-06 22:03:41 -08:00
TreeHugger Robot
4f302baba3 Merge "Moved implicit intents into explicit intents" 2017-01-07 06:02:31 +00:00
Jack Yu
5569246e93 Moved implicit intents into explicit intents 
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
 2017-01-06 21:59:48 -08:00
David Friedman
8aab9e2296 Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9" into nyc-mr2-dev-plus-aosp 
am: cea9b99099

Change-Id: I8a6e872a2d6419e1bb343eb3aeb3967d82d73031
 2017-01-07 03:11:43 +00:00
David Friedman
b68cfbad8b Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9 
am: 7583234ece

Change-Id: I7bf139f6cadf547259122ef4505c64f477b27420
 2017-01-07 03:11:35 +00:00
David Friedman
e06384c363 Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed" into nyc-mr2-dev-plus-aosp 
am: b5aaead225

Change-Id: Ia9b3c5d768ff09d2723abe3b98d8a4bcdc2f2a40
 2017-01-07 03:10:06 +00:00
David Friedman
18fac3085a Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed 
am: fa57c1c713

Change-Id: If3934a12c75bd88850aa87b068fb430df8d7815d
 2017-01-07 03:09:56 +00:00
Dave Friedman
ad94eadf64 Merge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4" into nyc-mr2-dev-plus-aosp 
am: b07a52ee91

Change-Id: I6f89296178074412c3827da700d24c67ada5641e
 2017-01-07 03:08:20 +00:00
Dave Friedman
fa1a47e18b Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4 
am: 696f17fff2

Change-Id: I072533052cf5ce78f89defb889fd0e1b11710399
 2017-01-07 03:08:12 +00:00
Dave Friedman
a873bf444e Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: fb8676e50c 
am: 5346355f4d

Change-Id: I67559350187089b64f0ce092c1f6ae8e7a52542e
 2017-01-07 03:06:54 +00:00
Android Build Merger (Role)
cea9b99099 Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9" into nyc-mr2-dev-plus-aosp 2017-01-07 03:00:21 +00:00
Android Build Merger (Role)
b5aaead225 Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed" into nyc-mr2-dev-plus-aosp 2017-01-07 02:59:55 +00:00