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

207232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
f473084a4a am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '6df21b51b118281a46cfd3c13716718040a33aea':
  AAPT: Fix regression in resource versioning
 2015-08-16 02:54:54 +00:00
Quddus Chong
d61da06560 am 5abde23c: am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit '5abde23cf5d3bf00695e2309958a57e620ed1cd0':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-16 02:54:48 +00:00
Daniel Sandler
cf59d059a5 am 98e684e7: am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '98e684e7f464009192529f6a8f695979a4664e0f':
  Introducing M Land.
 2015-08-16 02:54:42 +00:00
Dan Sandler
d1b160f362 am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '87c1e1b8a1f6927d2c31375e83fd353110edd326':
  "I tried to think of the most harmless thing."
 2015-08-16 02:54:36 +00:00
Adam Lesinski
6df21b51b1 am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '085a6b42f49141089c142ae5364515af15a22f62':
  AAPT: Fix regression in resource versioning
 2015-08-16 02:48:37 +00:00
Quddus Chong
5abde23cf5 am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit 'ef7e8ccb185dbcddec29259c7a6a8b58096ecf52':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-16 02:48:32 +00:00
Daniel Sandler
98e684e7f4 am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit 'b66e755bdba57f163f25d08c207ef598eea7edae':
  Introducing M Land.
 2015-08-16 02:48:26 +00:00
Dan Sandler
87c1e1b8a1 am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '415c6cb2358a0ad4821ec58c287b1de94de78d72':
  "I tried to think of the most harmless thing."
 2015-08-16 02:48:19 +00:00
Geoff Mendal
92f58f7cfc am 567139ef: am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev 
* commit '567139efb31c3b5661206fb1a72087e560c4ab48':
  resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
 2015-08-16 02:45:23 +00:00
Geoff Mendal
567139efb3 am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev 
* commit 'a5e012e6236aaeabd6d00fa7c6b29ec146ffd764':
  resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
 2015-08-16 02:39:19 +00:00
Adam Lesinski
085a6b42f4 am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '89a3c5ad7508f5370126ef8454a6153f8d56bf37':
  AAPT: Fix regression in resource versioning
 2015-08-16 02:36:50 +00:00
Quddus Chong
ef7e8ccb18 am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit '791def59b9858efd1334da5d01fb906051dcc028':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-16 02:36:45 +00:00
Daniel Sandler
b66e755bdb am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '64b05c0fd413d481cea19e9590732e8219a60912':
  Introducing M Land.
 2015-08-16 02:36:39 +00:00
Dan Sandler
415c6cb235 am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
  "I tried to think of the most harmless thing."
 2015-08-16 02:36:17 +00:00
Geoff Mendal
a5e012e623 Merge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-dev 2015-08-15 19:25:34 -07:00
Adam Lesinski
89a3c5ad75 am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '0cd143adae642465a26a7eaac96030bb18826e94':
  AAPT: Fix regression in resource versioning
 2015-08-16 01:33:48 +00:00
Quddus Chong
791def59b9 am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit 'b8fb239ac53ab462c8de12635c84c2216cf57f3b':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-16 01:33:44 +00:00
Daniel Sandler
64b05c0fd4 am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '9f238a9455639fccb6f44abd03752e3bb3bbc91e':
  Introducing M Land.
 2015-08-16 01:33:37 +00:00
Dan Sandler
8c8387d235 resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd
 2015-08-15 18:33:29 -04:00
Daniel Sandler
8dcda391c7 resolved conflicts for merge of 8ad3e817 to mnc-dr-dev 
Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
 2015-08-15 00:03:09 -07:00
Dan Albert
78c2711ae3 Merge "Fix pessimizing move." into mnc-dr-dev-plus-aosp 2015-08-15 03:17:32 +00:00
Chris Craik
8910175f0b am 63d3a610: (-s ours) am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work" 
* commit '63d3a610642b1cc5ed26a1ae21c335c33366c356':
  Make the value for shadowRadius less than 1.0 work
 2015-08-14 22:45:14 +00:00
Chris Craik
63d3a61064 am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work" 
* commit 'e3f0a881c20072a644317330ecf7409c81e96888':
  Make the value for shadowRadius less than 1.0 work
 2015-08-14 22:13:43 +00:00
Chris Craik
e3f0a881c2 Merge "Make the value for shadowRadius less than 1.0 work" 2015-08-14 22:02:19 +00:00
Dan Albert
598319d017 am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete." 
* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
  Fix mismatched new[]/delete.
 2015-08-14 21:43:19 +00:00
Dan Albert
16e5aba9c8 am 4a2a890b: Merge "Fix mismatched new[]/delete." 
* commit '4a2a890b32a1e8c3ffeea82b3c12f707b5a9b8f4':
  Fix mismatched new[]/delete.
 2015-08-14 21:33:07 +00:00
Dan Albert
4a2a890b32 Merge "Fix mismatched new[]/delete." 2015-08-14 21:23:29 +00:00
Dan Albert
8dc8313c3e Fix mismatched new[]/delete. 
The new clang will emit a warning for this.

Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36
 2015-08-14 14:12:29 -07:00
Adam Lesinski
0cd143adae Merge "AAPT: Fix regression in resource versioning" into mnc-dev 2015-08-14 20:46:49 +00:00
Quddus Chong
b8fb239ac5 Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 2015-08-14 20:44:54 +00:00
Dan Albert
68dd736156 Fix pessimizing move. 
Using std::move here prevents the compiler from performing copy
elision.

Change-Id: I80e98229359bdff5873be602d85ae6c502c67c1d
(cherry picked from commit 986d3f2eee7bbfbb588aa0e26f250d4016769ff2)
 2015-08-14 20:43:03 +00:00
Adam Lesinski
beb9e33bfb AAPT: Fix regression in resource versioning 
With a set of resources with the following configurations:

()
(land)

the regression caused any resources that needed to be versioned in configuration () to be lost.

Bug:23038206
Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa
 2015-08-14 13:41:46 -07:00
Adam Lesinski
c852a3e39c am eb694bb6: am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit 'eb694bb6e69dd382e9ed114dde604c6a0942c3c2':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 20:12:44 +00:00
Adam Lesinski
eb694bb6e6 am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '546909c9901f3acc659b3402fbf7320c96f562ad':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 20:04:16 +00:00
Daniel Sandler
9f238a9455 Merge "Introducing M Land." into mnc-dev 2015-08-14 19:59:48 +00:00
Daniel Sandler
8ad3e81701 Merge ""I tried to think of the most harmless thing."" into mnc-dev 2015-08-14 19:59:35 +00:00
Adam Lesinski
546909c990 am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '479c482ca1788235afc776125eb6a79f1d9281c8':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 19:56:38 +00:00
Dan Sandler
8df3cfe6b8 Introducing M Land. 
The "M" is for Multiplayer.

Bug: 21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5
 2015-08-14 15:51:13 -04:00
Julia Reynolds
c0455509b8 am 8dd0bce6: am 4e65a05f: am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev 
* commit '8dd0bce6174ffff075e8c780a5245b5c4a5df2a7':
  Clear calling identity before getting the current user.
 2015-08-14 19:48:13 +00:00
Adam Lesinski
479c482ca1 am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 19:47:54 +00:00
Julia Reynolds
8dd0bce617 am 4e65a05f: am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev 
* commit '4e65a05fb9d23f732e1cb72b67bc4fb2b7321788':
  Clear calling identity before getting the current user.
 2015-08-14 19:43:21 +00:00
Adam Lesinski
504600bb09 Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Julia Reynolds
4e65a05fb9 am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev 
* commit 'ac5f962898de5a00fa2067e987b94bc28c5bb096':
  Clear calling identity before getting the current user.
 2015-08-14 19:30:28 +00:00
Dan Sandler
deafeedc81 "I tried to think of the most harmless thing." 
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
 2015-08-14 15:25:55 -04:00
Julia Reynolds
ac5f962898 am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev 
* commit '7df411d0cced4a849bcdca58fa3c27eb731e0862':
  Clear calling identity before getting the current user.
 2015-08-14 19:22:04 +00:00
Jorim Jaggi
05b9dc9fb5 am c74a43bb: am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on 
* commit 'c74a43bba77b4a446b1c5979576619e896769b17':
  Start pulse fading exactly when screen is turned on
 2015-08-14 19:18:56 +00:00
Julia Reynolds
7df411d0cc Merge "Clear calling identity before getting the current user." into mnc-dev 2015-08-14 19:17:31 +00:00
Jorim Jaggi
c74a43bba7 am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on 
* commit '4fb3e9b3af6c44b3b4bc7eee0cb917520aa7474d':
  Start pulse fading exactly when screen is turned on
 2015-08-14 19:10:43 +00:00
Jorim Jaggi
4fb3e9b3af am 50ff3afb: Start pulse fading exactly when screen is turned on 
* commit '50ff3afb01f2ac4a93dba418a71d54ad8adeba9d':
  Start pulse fading exactly when screen is turned on
 2015-08-14 19:01:55 +00:00
Jean-Michel Trivi
c0708cd01a am c81daf7f: am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit 'c81daf7ff1c2905aaea5c65c6e73a6db06ee5be8':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 18:55:23 +00:00