Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
330,400 Commits 3 Branches 0 Tags
cf751f2189fa83f279d525acfe75fcd5cc703fc5
Commit Graph

330400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
cf751f2189 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev 
am: d349bd741d

Change-Id: If41945b25a473afa1c870e294a4b42e856e5c42c
 2018-09-30 23:11:05 -07:00
Bill Yi
8efa418123 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 
am: 1e00122904  -s ours

Change-Id: I5efbcb9878eff1c5df234fdafc8fec126dbf95ca
 2018-09-30 23:08:41 -07:00
Bill Yi
6b2064e5c6 Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev 
am: 0adf6e1981

Change-Id: I689851b43fd7ad2577badd4115571478d1597be3
 2018-09-30 23:04:11 -07:00
Bill Yi
b551c79453 [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae 
am: 997014d63a  -s ours

Change-Id: I20a39d2e1be36339d11611ed8db8963c624ed4a1
 2018-09-30 23:01:49 -07:00
Bill Yi
2e250a6542 [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d 
am: 20ce1f4c33  -s ours

Change-Id: I78a7a1809236cb0867143d2c4deeddfbdc4e9a18
 2018-09-30 22:58:21 -07:00
TreeHugger Robot
d349bd741d Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177
  [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8
  Import translations. DO NOT MERGE
 2018-10-01 05:39:25 +00:00
TreeHugger Robot
0adf6e1981 Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f
  Import translations. DO NOT MERGE
 2018-10-01 05:38:16 +00:00
Android Build Merger (Role)
1e00122904 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 
Change-Id: I602bacf08051d3d112a43f8559166c12eec993f9
 2018-09-30 13:07:35 +00:00
Android Build Merger (Role)
5883bd3177 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 
Change-Id: If0f6fc2ec219fc27201f4d907008e082e6e194ee
 2018-09-30 13:07:25 +00:00
Bill Yi
b19a62bcf8 Import translations. DO NOT MERGE 
Change-Id: Ic381ee9e91646a44ffd0de0060758753fe0b128b
Auto-generated-cl: translation import
 2018-09-30 06:07:00 -07:00
Android Build Merger (Role)
20ce1f4c33 [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d 
Change-Id: Iab79e57d33e496e6a7a8d6254490684b940c8b32
 2018-09-30 12:35:02 +00:00
Android Build Merger (Role)
e50fc63e3d [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 
Change-Id: I72bd220fef91e2a5bc5b7774d5195b0f65099b48
 2018-09-30 12:34:48 +00:00
Bill Yi
6105ad5932 Import translations. DO NOT MERGE 
Change-Id: I4abcce26cc5b73a42f658d10e85154948949136c
Auto-generated-cl: translation import
 2018-09-30 05:34:07 -07:00
Android Build Merger (Role)
997014d63a [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae 
Change-Id: I009164bbe332a77f8967c76f2c417e8958e5c57a
 2018-09-30 12:23:33 +00:00
Android Build Merger (Role)
07dfa0baae [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f 
Change-Id: I20e457d90615a005e83f7f3c46006a505deee29b
 2018-09-30 12:23:14 +00:00
Bill Yi
5587649e8f Import translations. DO NOT MERGE 
Change-Id: I85f31d6bac9ff093dd6ef9d129126dfc96b92e4e
Auto-generated-cl: translation import
 2018-09-30 05:22:43 -07:00
Atanas Kirilov
5ab6f8bee4 Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev 
am: 7c3c200380

Change-Id: I1ef857d32f55c27a8d94508a5216c2f7d73d853e
 2018-09-28 17:41:06 -07:00
Atanas Kirilov
86fd67ac10 Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev 
am: 7b08baaa2a

Change-Id: Ie963bfc2a22b5c2cb84e71611af755dc23594086
 2018-09-28 17:26:46 -07:00
Atanas Kirilov
3bb25f8b87 Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev 
am: 3262a5ad5f

Change-Id: I148aeead42b1f969cb8ff5153d7d296e84b0f4a7
 2018-09-28 17:22:01 -07:00
Atanas Kirilov
3f2bc41d8b Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev 
am: 74d82f556d

Change-Id: I4344edb030e161565b0a0b0203463668cbfd5a8b
 2018-09-28 16:54:41 -07:00
Atanas Kirilov
b908fd8d07 Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr2-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
 2018-09-28 23:21:47 +00:00
Atanas Kirilov
e8fea59d6e Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
 2018-09-28 23:21:47 +00:00
Atanas Kirilov
7c3c200380 Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 skipped: 50861d59c2
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
 2018-09-28 23:21:46 +00:00
Atanas Kirilov
7b08baaa2a Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev 2018-09-28 23:21:09 +00:00
Atanas Kirilov
3262a5ad5f Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 skipped: 90b8425c0b
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."
 2018-09-28 23:20:32 +00:00
Atanas Kirilov
74d82f556d Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev 2018-09-28 23:20:29 +00:00
Android Build Merger (Role)
8f9371a8b9 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 skipped: 90b8425c0b 
Change-Id: I614084f668b63261c14748b9dc0faf7c94aaedbd
 2018-09-28 20:35:10 +00:00
Android Build Merger (Role)
90b8425c0b [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 
Change-Id: I2df84d1d165f276b0da0aa58c4945f9a5d89e31f
 2018-09-28 20:34:53 +00:00
Android Build Merger (Role)
84b50e6a10 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 
Change-Id: I01bfdf7bcc657acf3827aa0b1675adf107562f8a
 2018-09-28 20:34:40 +00:00
Android Build Merger (Role)
db87c8952c [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 skipped: 50861d59c2 
Change-Id: I60d4127489f1d8f26deb7ad822e16141cc4a4b16
 2018-09-28 20:34:39 +00:00
Android Build Merger (Role)
446837c874 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe 
Change-Id: I094a6ffa8dee70d4f9f45c4f8d9929d92b078cec
 2018-09-28 20:34:28 +00:00
Atanas Kirilov
bb4dcd1099 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." 
This reverts commit 05dc947c63.

Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189

Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f
 2018-09-28 20:34:23 +00:00
Android Build Merger (Role)
50861d59c2 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 
Change-Id: If5cdbd2e616e8441fe469950342114c6771d1571
 2018-09-28 20:34:21 +00:00
Android Build Merger (Role)
79c6a599fe [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 
Change-Id: I178b86c62e2b0e8d3399897adaa3bfc191daea2d
 2018-09-28 20:34:21 +00:00
Atanas Kirilov
999e3fe986 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." 
This reverts commit 8da6786608.

Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189

Change-Id: I1826a5b6889f21fbbe16311a3da66c93e26383f3
 2018-09-28 20:34:17 +00:00
Android Build Merger (Role)
276f6cbb70 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be 
Change-Id: I83b2b097d30d2ea1fae3361cc06c503d61a444e8
 2018-09-28 20:34:04 +00:00
Android Build Merger (Role)
84756be0be [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 
Change-Id: Ie3b9caf9452711a136f50a5ac8aa4946fa0d2767
 2018-09-28 20:33:53 +00:00
Atanas Kirilov
4b0000865f RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." 
This reverts commit 8210764404.

Reason for revert: triggers other issue.
Bug: 114365189

Change-Id: If6f500e8abdc343774c5e853ba8e7c457ffa5961
 2018-09-28 20:33:52 +00:00
Android Build Merger (Role)
94e1a09bc6 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 
Change-Id: Ib9aa56a12fff0fb53848b9856fb89c6bb4de3793
 2018-09-28 20:33:45 +00:00
Atanas Kirilov
95a3e91846 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." 
This reverts commit fa69d725eb.

Reason for revert: triggers other issue.
Bug: 114365189

Change-Id: I746c74b00f4524575279cdaa831435d12425de20
 2018-09-28 20:33:41 +00:00
Michael Wachenschwanz
1f5050c054 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev 
am: d32c2a4189

Change-Id: Ie2ad590368e9c10f6222d9ae65470ebb12dabac2
 2018-09-05 18:46:57 -07:00
TreeHugger Robot
d32c2a4189 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec am: 686897ddd9
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
78bacb4061 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr2-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
218f82342a Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into cw-f-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
28850f8620 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr1-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
TreeHugger Robot
e58385ab65 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-dr1-dev 
* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel
 2018-09-06 01:29:28 +00:00
Wale Ogunwale
79ee5768da [automerger skipped] Merge "Hide overlay windows when requesting media projection permission." into oc-dev 
am: 0d4d38e3f9  -s ours

Change-Id: I021db34826711805dff7a43fd5f79f4d49a831bb
 2018-09-05 18:17:11 -07:00
Wale Ogunwale
5c6dd2cd0c Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev 
am: 471a4e6076

Change-Id: Ie51140203150cd9ef361e713700dfef128651f4e
 2018-09-05 18:03:00 -07:00
TreeHugger Robot
0d4d38e3f9 Merge "Hide overlay windows when requesting media projection permission." into oc-dev 2018-09-06 00:48:33 +00:00
akirilov
d55320b524 Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev 
am: 08d2780e1e

Change-Id: I3d963182b12d33718157576105d10c7da56ec228
 2018-09-05 17:32:07 -07:00