Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,604 Commits 3 Branches 0 Tags
e87b5750466508e3e6a28f95ef035865d022d0b9
Commit Graph

15175 Commits

Author SHA1 Message Date
TreeHugger Robot
21d4a1b519 Merge "Import translations. DO NOT MERGE" 2016-05-06 15:36:27 +00:00
Ajay Panicker
852aa88d6b Protect TRANSFER_COMPLETE broadcast am: 2759e429d1 am: 71430fefe8 
am: 2e2a044ea2

* commit '2e2a044ea27bc70180220f75deceab18fd595c44':
  Protect TRANSFER_COMPLETE broadcast

Change-Id: If024a1017cffd71a569751746d27fa3cdd242bd7
 2016-05-06 15:29:45 +00:00
Ajay Panicker
71430fefe8 Protect TRANSFER_COMPLETE broadcast 
am: 2759e429d1

* commit '2759e429d1f5e18869de34e5f0e13257c269aff9':
  Protect TRANSFER_COMPLETE broadcast

Change-Id: I177417a0bdd7ddbcb174dc3ce47d82d8faf08cb8
 2016-05-06 15:19:09 +00:00
Ajay Panicker
2759e429d1 Protect TRANSFER_COMPLETE broadcast 
Bug: 28621801
Change-Id: Ia90abd00694ae80000f59ee0a17826592fd2159b
 2016-05-06 15:11:30 +00:00
Bill Yi
f9eb8282cf Import translations. DO NOT MERGE 
Change-Id: I310e4c4effad31d6706d1a3260caa3bc2b6107f6
Auto-generated-cl: translation import
 2016-05-06 03:13:32 -07:00
Bill Yi
d547c12fb0 Import translations. DO NOT MERGE 
Change-Id: I283e67679f48ab23e33f64e1f04323c6d998dbfa
Auto-generated-cl: translation import
 2016-05-06 01:30:13 -07:00
Adam Powell
33d1dd6370 Merge "Have the Resolver/Chooser activities handle resize config changes" into nyc-dev am: a75d4877af am: da00132d47 
am: c86ba5580d

* commit 'c86ba5580da11f83e976224eff7ea577a829c749':
  Have the Resolver/Chooser activities handle resize config changes

Change-Id: Icfa8381fa99cc8a2697ce2605d6e0194a372dfef
 2016-05-05 16:16:32 +00:00
Adam Powell
da00132d47 Merge "Have the Resolver/Chooser activities handle resize config changes" into nyc-dev 
am: a75d4877af

* commit 'a75d4877af7fa045cc91b2d60d3801aa098608de':
  Have the Resolver/Chooser activities handle resize config changes

Change-Id: I6d434e7a921e73e462d38689412c208a4aec614c
 2016-05-05 16:10:20 +00:00
Adam Powell
a75d4877af Merge "Have the Resolver/Chooser activities handle resize config changes" into nyc-dev 2016-05-05 16:04:07 +00:00
Clara Bayarri
47c4196ef4 Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1 am: 0722dabda6 
am: ad439a7d03

* commit 'ad439a7d03380230f074a4a9593d3b825bfa636f':
  Fix RTL margins on Power dialog

Change-Id: Ifd48b5b394f58ec1ccfbe1187124c614c372b1b8
 2016-05-05 13:42:27 +00:00
Clara Bayarri
ad439a7d03 Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1 
am: 0722dabda6

* commit '0722dabda6250c7e42a1ba95e75ac0d62ed38aab':
  Fix RTL margins on Power dialog

Change-Id: Iedac5603ca3baded90b00142121b4816eb493b14
 2016-05-05 13:37:00 +00:00
Clara Bayarri
9a1cc86c35 Merge "Fix RTL margins on Power dialog" into nyc-dev 
am: 6bfac039b1

* commit '6bfac039b130268868af21252c58d07fcaa64074':
  Fix RTL margins on Power dialog

Change-Id: Icb15ac4c932645e3a07197a9d181e283a4f34fd8
 2016-05-05 13:34:31 +00:00
Clara Bayarri
0722dabda6 Merge "Fix RTL margins on Power dialog" into nyc-dev 
am: 6bfac039b1

* commit '6bfac039b130268868af21252c58d07fcaa64074':
  Fix RTL margins on Power dialog

Change-Id: I3d18791d9008dfd877878008e81507efdb84723f
 2016-05-05 13:34:30 +00:00
Clara Bayarri
6bfac039b1 Merge "Fix RTL margins on Power dialog" into nyc-dev 2016-05-05 13:29:14 +00:00
Rubin Xu
eae1425bf6 Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95 am: b9d94a454d 
am: c926f0eb0f

* commit 'c926f0eb0fbc58a53e0ffdbf0fc9a994a95e886d':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: Ic07faee56bbed2f5f18a35fc0a42e149a055961e
 2016-05-05 13:22:34 +00:00
Rubin Xu
b9d94a454d Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev 
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
 2016-05-05 13:12:45 +00:00
Rubin Xu
6f2cff43c0 Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev 
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I9d76de442e2b852314874d4121be7f15e40045b1
 2016-05-05 13:12:43 +00:00
Rubin Xu
0fb6b9e18c Guard retrievePreRebootSecurityLogs with config flag 
Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
 2016-05-05 12:00:50 +01:00
Ruben Brunk
f9d60d034e Merge "Update VR API docs." into nyc-dev am: 01d232988a am: 2d1a1a4521 
am: d12543c983

* commit 'd12543c9836ebae9f82045ef626d09da2654363f':
  Update VR API docs.

Change-Id: Ic26060e0684b983767b399490e8d47c0420a1c11
 2016-05-05 00:49:47 +00:00
Adam Powell
46ef0579dd Have the Resolver/Chooser activities handle resize config changes 
Both of these activities do additional work and look janky when
rebuilding for a config change, especially in the presence of
multiwindow. As neither of them use layouts or other resources that
vary based on configuration, mark them as handling the relevant config
changes.

Bug 27171954

Change-Id: I38df1d875bcb063d72316b586c4d3f8074c4fad9
 2016-05-04 16:47:59 -07:00
Ruben Brunk
17f3a40645 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I1b2cc88ca390c90d42cae3736aaf986e6c0e9396
 2016-05-04 23:43:50 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
 2016-05-04 23:41:38 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Amit Mahajan
2c14a5886a Merge "Marking @SystemApi permissions @hide too." into nyc-dev am: 441da79d8a am: 8f04f5f3ba 
am: 075ceeda01

* commit '075ceeda01dd9890d7464492a291a94113a19e11':
  Marking @SystemApi permissions @hide too.

Change-Id: Ic8da194de3b1a405ed72a9c04e44a04f79e66eba
 2016-05-04 22:30:19 +00:00
Amit Mahajan
075ceeda01 Merge "Marking @SystemApi permissions @hide too." into nyc-dev am: 441da79d8a 
am: 8f04f5f3ba

* commit '8f04f5f3ba790fd0c240600075bdc7ed44a5ae4c':
  Marking @SystemApi permissions @hide too.

Change-Id: Icfe04551aa2feac7351a4489a8516e79026b1b83
 2016-05-04 21:55:01 +00:00
Amit Mahajan
562c9ce030 Merge "Marking @SystemApi permissions @hide too." into nyc-dev 
am: 441da79d8a

* commit '441da79d8aa7b873f23227d10ecd425671b85506':
  Marking @SystemApi permissions @hide too.

Change-Id: Iabcd167da951ff487f3fa143c65b32af94a46592
 2016-05-04 21:37:35 +00:00
Amit Mahajan
8f04f5f3ba Merge "Marking @SystemApi permissions @hide too." into nyc-dev 
am: 441da79d8a

* commit '441da79d8aa7b873f23227d10ecd425671b85506':
  Marking @SystemApi permissions @hide too.

Change-Id: Ic4516f40e3845b5bc4863a5b52039c2c770d68f4
 2016-05-04 21:37:29 +00:00
TreeHugger Robot
441da79d8a Merge "Marking @SystemApi permissions @hide too." into nyc-dev 2016-05-04 20:50:16 +00:00
Baligh Uddin
a90acec632 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I0bd21ace6a871d1e74ce5a670acf2f0ed30c12fe
 2016-05-03 23:07:15 -07:00
Ajay Panicker
491354e52d Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" into nyc-dev am: 95aa2fc323 am: 0a20048742 
am: 1b0d5d3414

* commit '1b0d5d3414dfb0e881af0d374da80965a2cf95c6':
  List the CONNECTION_STATE_CHANGED broadcast for MAP as protected

Change-Id: I96c9d28211ee4657ceb1928c182a9153ac18613f
 2016-05-03 20:05:28 +00:00
Ajay Panicker
0a20048742 Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" into nyc-dev 
am: 95aa2fc323

* commit '95aa2fc3234f0c842cf9a2b0de44e2f093dcb5d5':
  List the CONNECTION_STATE_CHANGED broadcast for MAP as protected

Change-Id: Ia8dc4f70e9c2dd5151197d4d1933bfc8650a8fff
 2016-05-03 20:00:36 +00:00
Ajay Panicker
bda2699c81 Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" into nyc-dev 
am: 95aa2fc323

* commit '95aa2fc3234f0c842cf9a2b0de44e2f093dcb5d5':
  List the CONNECTION_STATE_CHANGED broadcast for MAP as protected

Change-Id: I96dbeb48f7f80ab6f2920169c1b111ce623d4a9c
 2016-05-03 20:00:32 +00:00
Ajay Panicker
2f78bf96d2 List the CONNECTION_STATE_CHANGED broadcast for MAP as protected 
Bug: 28527879
Change-Id: Ifb2db87677e92022814bb9704c26009d249ac6ce
 2016-05-03 11:24:13 -07:00
Ajay Panicker
9e35b71428 List the SDP_RECORD broadcast as protected 
am: 65fad18461

* commit '65fad18461b64ac35bf65e463e7f792c6df72add':
  List the SDP_RECORD broadcast as protected

Change-Id: I8fe34d0639b408ff21338a7934c1aa76afcdc725
 2016-05-03 17:47:37 +00:00
Ajay Panicker
78e1e7c2d9 Merge "List the SDP_RECORD broadcast as protected" am: 0d14c01a3e am: 60b2f80841 am: 951369f52c 
am: 27f27eae82

* commit '27f27eae823885b2d33bafd20c62036e914f2b2c':
  List the SDP_RECORD broadcast as protected

Change-Id: I6d1616c64b1d27c91e149702bf2527f47340d553
 2016-05-03 17:44:57 +00:00
Ajay Panicker
951369f52c Merge "List the SDP_RECORD broadcast as protected" am: 0d14c01a3e 
am: 60b2f80841

* commit '60b2f80841270da056feb44416b3be66273c54ac':
  List the SDP_RECORD broadcast as protected

Change-Id: Ib91da1d39bac4b23804c0a74f94b43e138d5f749
 2016-05-03 17:35:19 +00:00
Ajay Panicker
65fad18461 List the SDP_RECORD broadcast as protected 
Bug: 28257589
Change-Id: I97ef91fa3a7f7ef62fd96ca079e0a6d5a957bc71
 2016-05-03 17:32:57 +00:00
Makoto Onuki
d1bc17aacd Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d 
am: 2c0af8597d

* commit '2c0af8597dd3edb155893453dbb03027dc95135e':
  ShortcutManager: finishing touches

Change-Id: Id54d01e50b8120b898263a674b1886e2f5c16ac4
 2016-05-03 16:45:09 +00:00
Makoto Onuki
2c0af8597d Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev 
am: 59cfcb502d

* commit '59cfcb502d0907af2b4645dc79466541378fefb6':
  ShortcutManager: finishing touches

Change-Id: I20552fe48cf9f87787747324c6c8144d9b555318
 2016-05-03 16:39:37 +00:00
Android Build Merger (Role)
59cfcb502d Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev 2016-05-03 16:37:29 +00:00
Makoto Onuki
96ef96b563 Merge "ShortcutManager: finishing touches" into nyc-dev 
am: 7d164d35a4

* commit '7d164d35a41d2aa351f0a27faf05fc67ba262c07':
  ShortcutManager: finishing touches

Change-Id: I565dace9a52645fab1e1f419b8a9bec3b2b64517
 2016-05-03 16:36:45 +00:00
Makoto Onuki
c0cd95b0f9 Merge "ShortcutManager: finishing touches" into nyc-dev 
am: 7d164d35a4

* commit '7d164d35a41d2aa351f0a27faf05fc67ba262c07':
  ShortcutManager: finishing touches

Change-Id: I00b4f95180faef45f18b5ca3ddfa714e97424aa0
 2016-05-03 16:36:41 +00:00
Baligh Uddin
5a6d6b9ee9 Merge "Import translations. DO NOT MERGE" 2016-05-03 16:34:20 +00:00
Baligh Uddin
94942bb070 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-03 16:33:42 +00:00
Baligh Uddin
d606aef7a9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-03 16:32:30 +00:00
Makoto Onuki
7d164d35a4 Merge "ShortcutManager: finishing touches" into nyc-dev 2016-05-03 16:27:46 +00:00
Baligh Uddin
2883126329 Import translations. DO NOT MERGE 
Change-Id: I867dc7d25155badfffffcc1d02c20915e6a6659e
Auto-generated-cl: translation import
 2016-05-02 19:57:14 -07:00
Baligh Uddin
0c45e37910 Import translations. DO NOT MERGE 
Change-Id: I5bd70e99b1e168110f2b664bebee7e3c94716c5b
Auto-generated-cl: translation import
 2016-05-02 19:44:52 -07:00
Ruben Brunk
927d3453d3 Update VR API docs. 
Bug: 28526281
Change-Id: Iff48d02a2fee542c5ded7fc8cd6cf74957eb738c
 2016-05-02 19:30:51 -07:00
Baligh Uddin
10fd7d8bc9 Import translations. DO NOT MERGE 
Change-Id: I0a00f4cb930191d6009b0690e9de3fab18ce5e97
Auto-generated-cl: translation import
 2016-05-02 17:38:04 -07:00